From: Martin Rudalics <rudalics@gmx.at>
Date: Fri, 3 Oct 2008 11:18:24 +0000 (+0000)
Subject: (window--display-buffer-1): Don't care about
X-Git-Tag: emacs-pretest-23.0.90~2666
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=feb1e9103f23b02349f435f4880619012e9d6caf;p=emacs.git

(window--display-buffer-1): Don't care about
visibility since raise-frame does.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d1000da75d..fa3ddedffff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-03  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (window--display-buffer-1): Don't care about
+	visibility since raise-frame does.
+
 2008-10-03  Mario Lang  <mlang@delysid.org>
 
 	* nxml/xmltok.el (xmltok-forward): Simplify.
diff --git a/lisp/window.el b/lisp/window.el
index d338aa20fcd..5afe1811dda 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -885,8 +885,8 @@ is higher than WINDOW."
 	(error nil)))))
 
 (defun window--display-buffer-1 (window)
-  "Deiconify the frame containing the window WINDOW.
-Do not deiconify the selected frame.  Return WINDOW."
+  "Raise the frame containing the window WINDOW.
+Do not raise the selected frame.  Return WINDOW."
   (let* ((frame (window-frame window))
 	 (visible (frame-visible-p frame)))
     (unless (or (not visible)
@@ -896,8 +896,6 @@ Do not deiconify the selected frame.  Return WINDOW."
 		;; is visible.
 		(and (minibuffer-window-active-p (selected-window))
 		     (eq frame (window-frame (minibuffer-selected-window)))))
-      (when (eq visible 'icon)
-	(make-frame-visible frame))
       (raise-frame frame))
     window))