diff options
| author | Martin Rudalics | 2013-08-23 08:52:19 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2013-08-23 08:52:19 +0200 |
| commit | 7fd5f65e89638e74471efd71ce62bed626cbe591 (patch) | |
| tree | f5f3fa44e1c05c6fa632762a43882a96d38be59d | |
| parent | 6b729d1685255d309d6de0ac1c973527ec691f8b (diff) | |
| download | emacs-7fd5f65e89638e74471efd71ce62bed626cbe591.tar.gz emacs-7fd5f65e89638e74471efd71ce62bed626cbe591.zip | |
In display-buffer-pop-up-frame make BUFFER current (Bug#15133).
* window.el (display-buffer-pop-up-frame): Call pop-up-frame-function
with BUFFER current so `make-frame' will use it as the new frame's
buffer (Bug#15133).
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/window.el | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0bba2e5fb58..b74f4886f37 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-23 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * window.el (display-buffer-pop-up-frame): Call | ||
| 4 | pop-up-frame-function with BUFFER current so `make-frame' will | ||
| 5 | use it as the new frame's buffer (Bug#15133). | ||
| 6 | |||
| 1 | 2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2013-08-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * calendar/timeclock.el: Minor cleanups. | 9 | * calendar/timeclock.el: Minor cleanups. |
diff --git a/lisp/window.el b/lisp/window.el index 64cf0a72110..21e40071782 100644 --- a/lisp/window.el +++ b/lisp/window.el | |||
| @@ -5642,7 +5642,10 @@ new frame." | |||
| 5642 | (fun pop-up-frame-function) | 5642 | (fun pop-up-frame-function) |
| 5643 | frame window) | 5643 | frame window) |
| 5644 | (when (and fun | 5644 | (when (and fun |
| 5645 | (setq frame (funcall fun)) | 5645 | ;; Make BUFFER current so `make-frame' will use it as the |
| 5646 | ;; new frame's buffer (Bug#15133). | ||
| 5647 | (with-current-buffer buffer | ||
| 5648 | (setq frame (funcall fun))) | ||
| 5646 | (setq window (frame-selected-window frame))) | 5649 | (setq window (frame-selected-window frame))) |
| 5647 | (prog1 (window--display-buffer | 5650 | (prog1 (window--display-buffer |
| 5648 | buffer window 'frame alist display-buffer-mark-dedicated) | 5651 | buffer window 'frame alist display-buffer-mark-dedicated) |