auto upstream

4 files changed, 23 insertions, 13 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index cb6930f9acc..04dcee7b6eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.c (select_window): Don't record_buffer while the invariant is
+        temporarily broken (bug#14161).
+
+        * fns.c (Fdelq): Don't assume !NILP => CONSP.
+
 2013-04-07  Eli Zaretskii  <eliz@gnu.org>
 
         * fileio.c (ACL_NOT_WELL_SUPPORTED): Define macro for WINDOWSNT.
diff --git a/src/fns.c b/src/fns.c
index 86bdc0250dc..08c6f055f38 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1551,7 +1551,7 @@ the value of a list `foo'.  */)
 
   tail = list;
   prev = Qnil;
-  while (!NILP (tail))
+  while (CONSP (tail))
     {
       CHECK_LIST_CONS (tail, list);
       tem = XCAR (tail);
diff --git a/src/keyboard.c b/src/keyboard.c
index eb9f93a4c7d..ab599512085 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -72,7 +72,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include TERM_HEADER
 #endif /* HAVE_WINDOW_SYSTEM */
 
-/* Variables for blockinput.h: */
+/* Variables for blockinput.h:  */
 
 /* Positive if interrupt input is blocked right now.  */
 volatile int interrupt_input_blocked;
@@ -4347,10 +4347,10 @@ timer_check_2 (Lisp_Object timers, Lisp_Object idle_timers)
             }
 
           idle_timer_ripe = EMACS_TIME_LE (idle_timer_time, idleness_now);
-          idle_timer_difference =
-            (idle_timer_ripe
-             ? sub_emacs_time (idleness_now, idle_timer_time)
-             : sub_emacs_time (idle_timer_time, idleness_now));
+          idle_timer_difference
+            = (idle_timer_ripe
+               ? sub_emacs_time (idleness_now, idle_timer_time)
+               : sub_emacs_time (idle_timer_time, idleness_now));
         }
 
       /* Decide which timer is the next timer,
diff --git a/src/window.c b/src/window.c
index 77604f4ee19..416d27d2405 100644
--- a/src/window.c
+++ b/src/window.c
@@ -486,12 +486,6 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
   w = XWINDOW (window);
   w->frozen_window_start_p = 0;
 
-  if (NILP (norecord))
-    {
-      w->use_time = ++window_select_count;
-      record_buffer (w->contents);
-    }
-
   /* Make the selected window's buffer current.  */
   Fset_buffer (w->contents);
 
@@ -516,6 +510,15 @@ select_window (Lisp_Object window, Lisp_Object norecord, int inhibit_point_swap)
 
   select_window_1 (window, inhibit_point_swap);
 
+  /* record_buffer can run QUIT, so make sure it is run only after we have
+     re-established the invariant between selected_window and selected_frame,
+     otherwise the temporary broken invariant might "escape" (bug#14161).  */
+  if (NILP (norecord))
+    {
+      w->use_time = ++window_select_count;
+      record_buffer (w->contents);
+    }
+
   bset_last_selected_window (XBUFFER (w->contents), window);
   windows_or_buffers_changed++;
   return window;
@@ -2930,7 +2933,7 @@ window-start value is reasonable when this function is called.  */)
 
   replace_window (root, window, 1);
 
-  /* This must become SWINDOW anyway ....... */
+  /* This must become SWINDOW anyway .......  */
   if (BUFFERP (w->contents) && !resize_failed)
     {
       /* Try to minimize scrolling, by setting the window start to the