(window--display-buffer-1): Don't care about

visibility since raise-frame does.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d1000da75dadb649612cb619cbf9baf4a1ba973..fa3ddedfffffe6dbb53db4c44ff144fcb008939b 100644 (file)
--- 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 d338aa20fcd15065f1e31a41470a62deeeceb860..5afe1811dda2b1be785dcb6784c026f0b7e788d7 100644 (file)
--- 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))