Commit 9a028c23 authored by Martin Rudalics's avatar Martin Rudalics
Browse files

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).
parent 9d89fec7
......@@ -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>
......
......@@ -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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment