aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xdisp.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index eea7d172804..7d1b78a5102 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-12-20 Paul Eggert <eggert@cs.ucla.edu>
2
3 * xdisp.c (redisplay_internal): Remove now-unused local.
4
12012-12-20 Stefan Monnier <monnier@iro.umontreal.ca> 52012-12-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove. 7 * xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove.
diff --git a/src/xdisp.c b/src/xdisp.c
index 95c858218d4..5b959f5e472 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12976,7 +12976,7 @@ redisplay_internal (void)
12976 ptrdiff_t count, count1; 12976 ptrdiff_t count, count1;
12977 struct frame *sf; 12977 struct frame *sf;
12978 int polling_stopped_here = 0; 12978 int polling_stopped_here = 0;
12979 Lisp_Object tail, frame, old_frame = selected_frame; 12979 Lisp_Object tail, frame;
12980 struct backtrace backtrace; 12980 struct backtrace backtrace;
12981 12981
12982 /* Non-zero means redisplay has to consider all windows on all 12982 /* Non-zero means redisplay has to consider all windows on all