* src/xdisp.c (redisplay_internal): Fix typo in last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 37118e9bd6c935329001b8da50067bcdd36a2551..d008f670867f5f6522e4eb3ba1fbc46bd98b2ec3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * xdisp.c (redisplay_internal): Fix typo in last change.
+
 2013-11-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        * regex.c: Fix --enable-gcc-warning glitch with GCC 4.5.2.

diff --git a/src/keyboard.c b/src/keyboard.c
index 1231b4ca30d0b0e78a96bc03cc7e1e3d3a72f158..a066900fc91c66b2580f7a394a87f167c8c9492c 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1629,8 +1629,8 @@ command_loop_1 (void)
                  && NILP (Fmemq (Vthis_command,
                                  Vselection_inhibit_update_commands)))
                {
-                 ptrdiff_t beg =
-                   XINT (Fmarker_position (BVAR (current_buffer, mark)));
+                 ptrdiff_t beg
+                   = XINT (Fmarker_position (BVAR (current_buffer, mark)));
                  ptrdiff_t end = PT;
                  if (beg < end)
                    call2 (Qx_set_selection, QPRIMARY,

diff --git a/src/xdisp.c b/src/xdisp.c
index b1251aad511cc81487af5632c3b96734ec4f1c93..021147ecba862fd9a68c8827831870d592a8a123 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13004,7 +13004,7 @@ redisplay_internal (void)
   if (NILP (Vmemory_full))
     prepare_menu_bars ();
 
-  if (windows_or_buffers_changed & !update_mode_lines)
+  if (windows_or_buffers_changed && !update_mode_lines)
     update_mode_lines = 32;
 
   reconsider_clip_changes (w);