Mercurial > hg > xemacs-beta

diff lisp/window-xemacs.el @ 259:11cf20601dec r20-5b28

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b28
author cvs
date Mon, 13 Aug 2007 10:23:02 +0200
parents 0e522484dd2a
children c5d627a313b1
line wrap: on
line diff
--- a/lisp/window-xemacs.el	Mon Aug 13 10:22:10 2007 +0200
+++ b/lisp/window-xemacs.el	Mon Aug 13 10:23:02 2007 +0200
@@ -461,7 +461,12 @@
 	     ;; Otherwise, find some window that it's already in, and
 	     ;; return that, unless that window is the selected window
 	     ;; and that isn't ok.  What a contorted mess!
-	     (setq window (get-buffer-window buffer target-frame))
+	     (setq window (or (if (not explicit-frame)
+				  ;; search the selected frame
+				  ;; first if the user didn't
+				  ;; specify an explicit frame.
+				  (get-buffer-window buffer nil))
+			      (get-buffer-window buffer target-frame)))
 	     (if (and window
 		      (or (not not-this-window-p)
 			  (not (eq window (selected-window)))))