aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/keyboard.c4
-rw-r--r--src/xdisp.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 37118e9bd6c..d008f670867 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12013-11-06 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * xdisp.c (redisplay_internal): Fix typo in last change.
4
12013-11-06 Paul Eggert <eggert@cs.ucla.edu> 52013-11-06 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * regex.c: Fix --enable-gcc-warning glitch with GCC 4.5.2. 7 * 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)
1629 && NILP (Fmemq (Vthis_command, 1629 && NILP (Fmemq (Vthis_command,
1630 Vselection_inhibit_update_commands))) 1630 Vselection_inhibit_update_commands)))
1631 { 1631 {
1632 ptrdiff_t beg = 1632 ptrdiff_t beg
1633 XINT (Fmarker_position (BVAR (current_buffer, mark))); 1633 = XINT (Fmarker_position (BVAR (current_buffer, mark)));
1634 ptrdiff_t end = PT; 1634 ptrdiff_t end = PT;
1635 if (beg < end) 1635 if (beg < end)
1636 call2 (Qx_set_selection, QPRIMARY, 1636 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)
13004 if (NILP (Vmemory_full)) 13004 if (NILP (Vmemory_full))
13005 prepare_menu_bars (); 13005 prepare_menu_bars ();
13006 13006
13007 if (windows_or_buffers_changed & !update_mode_lines) 13007 if (windows_or_buffers_changed && !update_mode_lines)
13008 update_mode_lines = 32; 13008 update_mode_lines = 32;
13009 13009
13010 reconsider_clip_changes (w); 13010 reconsider_clip_changes (w);