# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1085844222 0
# Node ID af9432138635c25b8a7ce3240a59669ca54d4b0d
# Parent  c5c73c8c2b3ed83f3f9a2d08c76ee050506a5e48
(with-selected-window): Undo previous change.

diff -r c5c73c8c2b3e -r af9432138635 lisp/subr.el
--- a/lisp/subr.el	Sat May 29 15:22:55 2004 +0000
+++ b/lisp/subr.el	Sat May 29 15:23:42 2004 +0000
@@ -1796,10 +1796,21 @@
 This does not alter the buffer list ordering.
 See also `with-temp-buffer'."
   (declare (indent 1) (debug t))
-  `(let ((save-selected-window-window (selected-window)))
+  ;; Most of this code is a copy of save-selected-window.
+  `(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.
+	 (save-selected-window-alist
+	  (mapcar (lambda (frame) (list frame (frame-selected-window frame)))
+		  (frame-list))))
      (unwind-protect
 	 (progn (select-window ,window 'norecord)
 		,@body)
+       (dolist (elt save-selected-window-alist)
+	 (and (frame-live-p (car elt))
+	      (window-live-p (cadr elt))
+	      (set-frame-selected-window (car elt) (cadr elt))))
        (if (window-live-p save-selected-window-window)
 	   (select-window save-selected-window-window 'norecord)))))