diff options
| author | Martin Rudalics | 2010-12-04 17:43:51 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-12-04 17:43:51 -0500 |
| commit | 6ed96c33f0fb05488bb45fc4ed5018a0cd3e45a7 (patch) | |
| tree | 7fbbc037667238b36f941aa7236ee2f92de21de0 | |
| parent | 37bf6ce2b49638516419b1cab86e2d891ade779e (diff) | |
| download | emacs-6ed96c33f0fb05488bb45fc4ed5018a0cd3e45a7.tar.gz emacs-6ed96c33f0fb05488bb45fc4ed5018a0cd3e45a7.zip | |
* dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil (Bug#7533).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/dired.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 95ee06e7812..300a5dd31d5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-12-04 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil | ||
| 4 | (Bug#7533). | ||
| 5 | |||
| 1 | 2010-12-04 W. Martin Borgert <debacle@debian.org> (tiny change) | 6 | 2010-12-04 W. Martin Borgert <debacle@debian.org> (tiny change) |
| 2 | 7 | ||
| 3 | * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode. | 8 | * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode. |
diff --git a/lisp/dired.el b/lisp/dired.el index b2bd082b1a6..4472c13bab2 100644 --- a/lisp/dired.el +++ b/lisp/dired.el | |||
| @@ -2755,7 +2755,8 @@ name, or the marker and a count of marked files." | |||
| 2755 | ;; that's possible. (Bug#1806) | 2755 | ;; that's possible. (Bug#1806) |
| 2756 | (split-window-vertically)) | 2756 | (split-window-vertically)) |
| 2757 | ;; Otherwise, try to split WINDOW sensibly. | 2757 | ;; Otherwise, try to split WINDOW sensibly. |
| 2758 | (split-window-sensibly window))))) | 2758 | (split-window-sensibly window)))) |
| 2759 | pop-up-frames) | ||
| 2759 | (pop-to-buffer (get-buffer-create buf))) | 2760 | (pop-to-buffer (get-buffer-create buf))) |
| 2760 | ;; If dired-shrink-to-fit is t, make its window fit its contents. | 2761 | ;; If dired-shrink-to-fit is t, make its window fit its contents. |
| 2761 | (when dired-shrink-to-fit | 2762 | (when dired-shrink-to-fit |