Preserve tty top-frames under various window-changing operations.

* subr.el (with-selected-window): Preserve the selected window's
terminal's top-frame.

* window.el (save-selected-window): Likewise.

* frame.c (delete_frame): When selecting a frame on a different
text terminal, do not alter the terminal's top-frame.

* term.c (Ftty_top_frame): New function.

* xdisp.c (format_mode_line_unwind_data): Record the target
frame's selected window and its terminal's top-frame.
(unwind_format_mode_line): Restore them.
(x_consider_frame_title, display_mode_line, Fformat_mode_line):
Callers changed.
(x_consider_frame_title): Do not condition on HAVE_WINDOW_SYSTEM,
since tty frames can be explicitly named.
(prepare_menu_bars): Likewise.

Fixes: debbugs:4702

3 files changed, 40 insertions, 16 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab66eaf58fb..71326e10748 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2012-06-19  Chong Yidong  <cyd@gnu.org>
+
+        * subr.el (with-selected-window): Preserve the selected window's
+        terminal's top-frame (Bug#4702).
+
+        * window.el (save-selected-window): Likewise.
+
 2012-06-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/python.el (python-rx-constituents): Move backquote.
diff --git a/lisp/subr.el b/lisp/subr.el
index 473cc3efddd..ba9b06d495b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3011,24 +3011,29 @@ the buffer list ordering."
   (declare (indent 1) (debug t))
   ;; Most of this code is a copy of save-selected-window.
   `(let* ((save-selected-window-destination ,window)
+          (save-selected-window-frame
+           (window-frame save-selected-window-destination))
           (save-selected-window-window (selected-window))
-          ;; Selecting a window on another frame changes not only the
-          ;; selected-window but also the frame-selected-window of the
-          ;; destination frame.  So we need to save&restore it.
+          ;; Selecting a window on another frame also changes that
+          ;; frame's frame-selected-window.  We must save&restore it.
           (save-selected-window-other-frame
-           (unless (eq (selected-frame)
-                       (window-frame save-selected-window-destination))
-             (frame-selected-window
-              (window-frame save-selected-window-destination)))))
+           (unless (eq (selected-frame) save-selected-window-frame)
+             (frame-selected-window save-selected-window-frame)))
+          (save-selected-window-top-frame
+           (unless (eq (selected-frame) save-selected-window-frame)
+             (tty-top-frame save-selected-window-frame))))
      (save-current-buffer
        (unwind-protect
            (progn (select-window save-selected-window-destination 'norecord)
                   ,@body)
          ;; First reset frame-selected-window.
-         (if (window-live-p save-selected-window-other-frame)
-             ;; We don't use set-frame-selected-window because it does not
-             ;; pass the `norecord' argument to Fselect_window.
-             (select-window save-selected-window-other-frame 'norecord))
+         (when (window-live-p save-selected-window-other-frame)
+           ;; We don't use set-frame-selected-window because it does not
+           ;; pass the `norecord' argument to Fselect_window.
+           (select-window save-selected-window-other-frame 'norecord)
+           (and (frame-live-p save-selected-window-top-frame)
+                (not (eq (tty-top-frame) save-selected-window-top-frame))
+                (select-frame save-selected-window-top-frame 'norecord)))
          ;; Then reset the actual selected-window.
          (when (window-live-p save-selected-window-window)
            (select-window save-selected-window-window 'norecord))))))
diff --git a/lisp/window.el b/lisp/window.el
index 6ea882d1ea2..7c3fe1a082f 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -47,12 +47,24 @@ order of recently selected windows and the buffer list ordering
 are not altered by this macro (unless they are altered in BODY)."
   (declare (indent 0) (debug t))
   `(let ((save-selected-window-window (selected-window))
-         ;; It is necessary to save all of these, because calling
-         ;; select-window changes frame-selected-window for whatever
-         ;; frame that window is in.
+         ;; We save and restore all frames' selected windows, because
+         ;; `select-window' can change the frame-selected-window of
+         ;; whatever frame that window is in.  Each text terminal's
+         ;; top-frame is preserved by putting it last in the list.
          (save-selected-window-alist
-          (mapcar (lambda (frame) (cons frame (frame-selected-window frame)))
-                  (frame-list))))
+          (apply 'append
+                 (mapcar (lambda (terminal)
+                           (let ((frames (frames-on-display-list terminal))
+                                 (top-frame (tty-top-frame terminal))
+                                 alist)
+                             (if top-frame
+                                 (setq frames
+                                       (cons top-frame
+                                             (delq top-frame frames))))
+                             (dolist (f frames)
+                               (push (cons f (frame-selected-window f))
+                                     alist))))
+                         (terminal-list)))))
      (save-current-buffer
        (unwind-protect
            (progn ,@body)