diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-06-21 17:16:32 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-06-21 17:16:32 +0200 |
| commit | 9e9de01439b2c57e79505ba0668894c9addc3bf1 (patch) | |
| tree | 61e016c16fe5522aab0a287825123068e7e1830e | |
| parent | d87ffdb72966234fccb07ea9dcb8646905741fe0 (diff) | |
Don't make popup frames unsplittable by default.
(display-buffer-alist, display-buffer-default-specifiers): Don't
make new frame unsplittable by default.
(display-buffer-normalize-argument): Fix doc-string typo and use
'same-frame-other-window instead of 'other-window when associating
with display-buffer-macro-specifiers.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/window.el | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index decf71a0ab..2055ce2b7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -20,6 +20,11 @@ options more faithfully. (pop-to-buffer): Don't rely on `display-buffer' selecting the window if it is on another frame. + (display-buffer-alist, display-buffer-default-specifiers): Don't + make new frame unsplittable by default. + (display-buffer-normalize-argument): Fix doc-string typo and use + 'same-frame-other-window instead of 'other-window when associating + with display-buffer-macro-specifiers. 2011-06-21 Vincent Belaïche <vincent.b.1@hotmail.fr> diff --git a/lisp/window.el b/lisp/window.el index 4c56d7ffe1..8934cc297a 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -3821,7 +3821,7 @@ subwindows can get as small as `window-safe-min-height' and (pop-up-window-min-width . 80) (reuse-window other nil nil) (pop-up-frame-alist - (height . 24) (width . 80) (unsplittable . t)) + (height . 24) (width . 80)) (reuse-window nil other visible) (reuse-window nil nil t) (reuse-window-even-sizes . t)) @@ -4372,8 +4372,7 @@ using the location specifiers `same-window' or `other-frame'." :tag "Pop-up frame" :value (pop-up-frame (pop-up-frame) - (pop-up-frame-alist - (height . 24) (width . 80) (unsplittable . t))) + (pop-up-frame-alist (height . 24) (width . 80))) :format "%t\n%v" :inline t (const :format "" pop-up-frame) @@ -5306,7 +5305,7 @@ user preferences expressed in `display-buffer-alist'." BUFFER-NAME is the name of the buffer that shall be displayed, SPECIFIERS is the second argument of `display-buffer'. LABEL the same argument of `display-buffer'. OTHER-FRAME non-nil means use -other-frame for other-windo." +other-frame for other-window." (let (normalized entry) (cond ((not specifiers) @@ -5321,7 +5320,7 @@ other-frame for other-windo." ;; `other-window' must be treated separately. (let ((entry (assq (if other-frame 'other-frame - 'other-window) + 'same-frame-other-window) display-buffer-macro-specifiers))) (dolist (item (cdr entry)) (setq normalized (cons item normalized))))) @@ -5434,14 +5433,16 @@ options." (when (listp pars) pars)) specifiers))))) - ;; `pop-up-frames', `display-buffer-reuse-frames', and - ;; `last-nonminibuffer-frame' set means search for a window shoing - ;; the same buffer of another frame. + ;; `pop-up-frames', `display-buffer-reuse-frames' means search for + ;; a window showing the buffer on some visible or iconfied frame. + ;; `last-nonminibuffer-frame' set and not the same frame means + ;; search that frame. (let ((frames (or (and (or use-pop-up-frames display-buffer-reuse-frames (not (last-nonminibuffer-frame))) ;; All visible or iconfied frames. 0) + ;; Same frame. (last-nonminibuffer-frame)))) (when frames (setq specifiers |