# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1291502631 18000
# Node ID d567b4182a1ae16bb8e73336e85b85ce6795f4f6
# Parent  3d34c0b303ff717eae14f6db2ca7999bd83fb9ab
* dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil (Bug#7533).

diff -r 3d34c0b303ff -r d567b4182a1a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 04 17:41:41 2010 -0500
+++ b/lisp/ChangeLog	Sat Dec 04 17:43:51 2010 -0500
@@ -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 -r 3d34c0b303ff -r d567b4182a1a lisp/dired.el
--- a/lisp/dired.el	Sat Dec 04 17:41:41 2010 -0500
+++ b/lisp/dired.el	Sat Dec 04 17:43:51 2010 -0500
@@ -2755,7 +2755,8 @@
 		    ;; 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