* dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil (Bug#7533).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 95ee06e7812c822122c9c0ae099188b12d9c8337..300a5dd31d5c4d182d8fc5b14dd29565d1c15505 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-04  Martin Rudalics  <rudalics@gmx.at>
+
+       * dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil
+       (Bug#7533).
+
 2010-12-04  W. Martin Borgert <debacle@debian.org>  (tiny change)
 
        * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.

diff --git a/lisp/dired.el b/lisp/dired.el
index b2bd082b1a65edbb0f5be06aeb3bad0ea00db5e7..4472c13bab297237039d5223e2901e4da6a31aa2 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2755,7 +2755,8 @@ name, or the marker and a count of marked files."
                    ;; that's possible.  (Bug#1806)
                    (split-window-vertically))
               ;; Otherwise, try to split WINDOW sensibly.
-              (split-window-sensibly window)))))
+              (split-window-sensibly window))))
+       pop-up-frames)
     (pop-to-buffer (get-buffer-create buf)))
   ;; If dired-shrink-to-fit is t, make its window fit its contents.
   (when dired-shrink-to-fit