auto upstream

3 files changed, 25 insertions, 14 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 402792b5460..ff6b9508d62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2013-04-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.c (do_switch_frame): Mark the TTY frame we switch to as
+        garbaged only if it is not already the top frame on its TTY.  This
+        prevents flickering due to constant redrawing of TTY frames when
+        there are GUI frames open in the same session.  (Bug#13864)
+
+2013-04-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * keyboard.c (timer_start_idle): Call internal-timer-start-idle instead
+        of marking the idle timers directly.
+
 2013-04-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * minibuf.c (Ftest_completion): Ignore non-string/symbol keys in hash
diff --git a/src/frame.c b/src/frame.c
index 2fe398296ed..ccd50122f50 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -834,10 +834,18 @@ do_switch_frame (Lisp_Object frame, int track, int for_deletion, Lisp_Object nor
 
   if (FRAME_TERMCAP_P (XFRAME (frame)) || FRAME_MSDOS_P (XFRAME (frame)))
     {
-      if (FRAMEP (FRAME_TTY (XFRAME (frame))->top_frame))
-        /* Mark previously displayed frame as now obscured.  */
-        SET_FRAME_VISIBLE (XFRAME (FRAME_TTY (XFRAME (frame))->top_frame), 2);
-      SET_FRAME_VISIBLE (XFRAME (frame), 1);
+      Lisp_Object top_frame = FRAME_TTY (XFRAME (frame))->top_frame;
+
+      /* Don't mark the frame garbaged and/or obscured if we are
+         switching to the frame that is already the top frame of that
+         TTY.  */
+      if (!EQ (frame, top_frame))
+        {
+          if (FRAMEP (top_frame))
+            /* Mark previously displayed frame as now obscured.  */
+            SET_FRAME_VISIBLE (XFRAME (top_frame), 2);
+          SET_FRAME_VISIBLE (XFRAME (frame), 1);
+        }
       FRAME_TTY (XFRAME (frame))->top_frame = frame;
     }
 
diff --git a/src/keyboard.c b/src/keyboard.c
index ab599512085..dbd3717c428 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4208,16 +4208,7 @@ timer_start_idle (void)
   timer_last_idleness_start_time = timer_idleness_start_time;
 
   /* Mark all idle-time timers as once again candidates for running.  */
-  for (timers = Vtimer_idle_list; CONSP (timers); timers = XCDR (timers))
-    {
-      Lisp_Object timer;
-
-      timer = XCAR (timers);
-
-      if (!VECTORP (timer) || ASIZE (timer) != 9)
-        continue;
-      ASET (timer, 0, Qnil);
-    }
+  call0 (intern ("internal-timer-start-idle"));
 }
 
 /* Record that Emacs is no longer idle, so stop running idle-time timers.  */