[Emacs-diffs] trunk r115009: * src/xdisp.c (redisplay_internal): Fix typo in last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 115009
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2013-11-06 16:17:26 -0500
message:
  * src/xdisp.c (redisplay_internal): Fix typo in last change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/xdisp.c                    xdisp.c-20091113204419-o5vbwnq5f7feedwu-240

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-11-06 19:36:12 +0000
+++ b/src/ChangeLog     2013-11-06 21:17:26 +0000
@@ -1,3 +1,7 @@
+2013-11-06  Stefan Monnier  <address@hidden>
+
+       * xdisp.c (redisplay_internal): Fix typo in last change.
+
 2013-11-06  Paul Eggert  <address@hidden>
 
        * regex.c: Fix --enable-gcc-warning glitch with GCC 4.5.2.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-11-06 18:41:31 +0000
+++ b/src/keyboard.c    2013-11-06 21:17:26 +0000
@@ -1629,8 +1629,8 @@
                  && 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,

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-11-06 18:41:31 +0000
+++ b/src/xdisp.c       2013-11-06 21:17:26 +0000
@@ -13004,7 +13004,7 @@
   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);