Install fixes for Bug#12764 and Bug#12766.

* window.el (quit-restore-window): If the window has been
created on an existing frame and ended up as the sole window on
that frame, do not delete it (Bug#12764).

* minibuf.c (read_minibuf): Restore current buffer since
choose_minibuf_frame calling Fset_frame_selected_window may
change it (Bug#12766).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88ea199cd20cf7d13f0c29d917075e0a765c9c7a..dc928c3567248bde85d913c1ab4366cb59676a35 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-31  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (quit-restore-window): If the window has been
+       created on an existing frame and ended up as the sole window on
+       that frame, do not delete it (Bug#12764).
+
 2012-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * progmodes/sh-script.el (sh--inside-noncommand-expression):

diff --git a/lisp/window.el b/lisp/window.el
index bd043390d90d68f5e3b99b3f20fdf6c06437e1d2..10f75d44d69f39c7e194528bfc36381fbfe86169 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3556,7 +3556,12 @@ the buffer of WINDOW.  The following values are handled:
         quad entry)
     (cond
      ((and (not prev-buffer)
-          (memq (nth 1 quit-restore) '(window frame))
+          (or (eq (nth 1 quit-restore) 'frame)
+              (and (eq (nth 1 quit-restore) 'window)
+                   ;; If the window has been created on an existing
+                   ;; frame and ended up as the sole window on that
+                   ;; frame, do not delete it (Bug#12764).
+                   (not (eq window (frame-root-window window)))))
           (eq (nth 3 quit-restore) buffer)
           ;; Delete WINDOW if possible.
           (window--delete window nil (eq bury-or-kill 'kill)))

diff --git a/src/ChangeLog b/src/ChangeLog
index 1ae99a22cf9d01233af6f46797d3302a0a14fd32..3ad653efd0f7bd356beffc6d5af056a7bb1893f3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-31  Martin Rudalics  <rudalics@gmx.at>
+
+       * minibuf.c (read_minibuf): Restore current buffer since
+       choose_minibuf_frame calling Fset_frame_selected_window may
+       change it (Bug#12766).
+
 2012-10-30  Jan Djärv  <jan.h.d@swipnet.se>
 
        * frame.c (Fframe_pixel_height): Fix documentation (Bug#12733).

diff --git a/src/minibuf.c b/src/minibuf.c
index 2cc89e75680277c79fcb07b952804a032d6a5009..dcc4af37c1341822156d1abb01aaaf20b64dc8e3 100644 (file)
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -472,6 +472,10 @@ read_minibuf (Lisp_Object map, Lisp_Object initial, Lisp_Object prompt,
 
   /* Choose the minibuffer window and frame, and take action on them.  */
 
+  /* Prepare for restoring the current buffer since choose_minibuf_frame
+     calling Fset_frame_selected_window may change it (Bug#12766).  */
+  record_unwind_protect (Fset_buffer, Fcurrent_buffer ());
+
   choose_minibuf_frame ();
 
   record_unwind_protect (choose_minibuf_frame_1, Qnil);