[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r104633: Regroup clauses in display-b
From: |
martin rudalics |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r104633: Regroup clauses in display-buffer-normalize-options (Bug#8851) and (Bug#8856). |
Date: |
Sun, 19 Jun 2011 16:32:12 +0200 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 104633
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-19 16:32:12 +0200
message:
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).
modified:
lisp/ChangeLog
lisp/window.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-06-19 10:17:56 +0000
+++ b/lisp/ChangeLog 2011-06-19 14:32:12 +0000
@@ -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 <address@hidden>
=== modified file 'lisp/window.el'
--- a/lisp/window.el 2011-06-19 10:17:56 +0000
+++ b/lisp/window.el 2011-06-19 14:32:12 +0000
@@ -5401,6 +5401,19 @@
(cons 'largest fun) (cons 'lru fun))
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).
+ (when pop-up-frames
+ ;; `pop-up-frame-function'. If `pop-up-frame-function' uses the
+ ;; now obsolete `pop-up-frame-alist' it will continue to do so.
+ (setq specifiers
+ (cons (cons 'pop-up-frame-function pop-up-frame-function)
+ specifiers))
+ ;; `pop-up-frame'
+ (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
@@ -5412,19 +5425,6 @@
(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).
- (when pop-up-frames
- ;; `pop-up-frame-function'. If `pop-up-frame-function' uses the
- ;; now obsolete `pop-up-frame-alist' it will continue to do so.
- (setq specifiers
- (cons (cons 'pop-up-frame-function pop-up-frame-function)
- specifiers))
- ;; `pop-up-frame'
- (setq specifiers
- (cons (list 'pop-up-frame pop-up-frames) specifiers)))
-
;; `same-window-p' group.
(when (same-window-p buffer-name)
;; Try to reuse the same (selected) window.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r104633: Regroup clauses in display-buffer-normalize-options (Bug#8851) and (Bug#8856).,
martin rudalics <=