auto upstream

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 @@
+2012-12-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * xdisp.c (redisplay_internal): Remove now-unused local.
+
 2012-12-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * xdisp.c (select_frame_for_redisplay, ensure_selected_frame): Remove.
diff --git a/src/xdisp.c b/src/xdisp.c
index ea27be2eb8e..a125ce22835 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -13030,7 +13030,7 @@ redisplay_internal (void)
   ptrdiff_t count, count1;
   struct frame *sf;
   int polling_stopped_here = 0;
-  Lisp_Object tail, frame, old_frame = selected_frame;
+  Lisp_Object tail, frame;
   struct backtrace backtrace;
 
   /* Non-zero means redisplay has to consider all windows on all