From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 6 Nov 2013 21:17:26 +0000 (-0500)
Subject: * src/xdisp.c (redisplay_internal): Fix typo in last change.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~922
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2e894cf5c87c3880fe5725ac3ef7e6ab529eaf1;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 37118e9bd6c..d008f670867 100644
--- 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 1231b4ca30d..a066900fc91 100644
--- 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 b1251aad511..021147ecba8 100644
--- 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);