diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2011-06-19 16:32:12 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2011-06-19 16:32:12 +0200 |
| commit | 9a028c23fb03e29337425bb351fe5786a19ccca6 (patch) | |
| tree | cf7d754a6fac176d68696d92343ed85b3bdbfb70 /lisp | |
| parent | 9d89fec7458c978272a716c33df41f9958f7fe7f (diff) | |
| download | emacs-9a028c23fb03e29337425bb351fe5786a19ccca6.tar.gz emacs-9a028c23fb03e29337425bb351fe5786a19ccca6.tar.bz2 emacs-9a028c23fb03e29337425bb351fe5786a19ccca6.zip | |
Regroup clauses in display-buffer-normalize-options (Bug#8851) and (Bug#8856).
* window.el (display-buffer-normalize-options): Move special-display-p
group after pop-up-frame group (Bug#8851) and (Bug#8856).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/window.el | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f3c0ea0572..f268646cda2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -23,6 +23,8 @@ (window-state-get-1, window-state-get, window-state-put-list) (window-state-put-1, window-state-put-2, window-state-put): New functions. + (display-buffer-normalize-options): Move special-display-p group + after pop-up-frame group (Bug#8851) and (Bug#8856). 2011-06-18 Chong Yidong <cyd@stupidchicken.com> diff --git a/lisp/window.el b/lisp/window.el index e79489e40b3..5737b1ca7ad 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -5401,17 +5401,6 @@ options." (cons 'largest fun) (cons 'lru fun)) specifiers)))) - ;; `special-display-p' group. - (when special-display-function - ;; `special-display-p' returns either t or a list of frame - ;; parameters to pass to `special-display-function'. - (let ((pars (special-display-p buffer-name))) - (when pars - (setq specifiers - (cons (list 'fun-with-args special-display-function - (when (listp pars) pars)) - specifiers))))) - ;; `pop-up-frame' group. Add things if `pop-up-frames' is non-nil ;; (we ignore the problem that callers usually don't care about ;; graphic-only). @@ -5425,6 +5414,17 @@ options." (setq specifiers (cons (list 'pop-up-frame pop-up-frames) specifiers))) + ;; `special-display-p' group. + (when special-display-function + ;; `special-display-p' returns either t or a list of frame + ;; parameters to pass to `special-display-function'. + (let ((pars (special-display-p buffer-name))) + (when pars + (setq specifiers + (cons (list 'fun-with-args special-display-function + (when (listp pars) pars)) + specifiers))))) + ;; `same-window-p' group. (when (same-window-p buffer-name) ;; Try to reuse the same (selected) window. |