aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2011-06-18 17:14:35 +0200
committerMartin Rudalics2011-06-18 17:14:35 +0200
commit28dec25a9fa1823e27276b717257d3dcbff16f9f (patch)
tree254682f200c312a5ea9c9661f1b8aefcce235cc2
parentbe3fb2b8752f83e91624e6427db159846abb998b (diff)
downloademacs-28dec25a9fa1823e27276b717257d3dcbff16f9f.tar.gz
emacs-28dec25a9fa1823e27276b717257d3dcbff16f9f.zip
One more fix for display-buffer-normalize-specifiers-1.
* window.el (display-buffer-normalize-specifiers-1): Fix thinko.
-rw-r--r--lisp/ChangeLog1
-rw-r--r--lisp/window.el3
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index afbca4c3118..c707a4b97bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -9,6 +9,7 @@
9 pop-up-windows is unset. Add a reuse-window specifier for the 9 pop-up-windows is unset. Add a reuse-window specifier for the
10 case popping up a new window fails. 10 case popping up a new window fails.
11 (special-display-popup-frame): Remove double quoting. 11 (special-display-popup-frame): Remove double quoting.
12 (display-buffer-normalize-specifiers-1): Fix thinko.
12 13
132011-06-17 Stefan Monnier <monnier@iro.umontreal.ca> 142011-06-17 Stefan Monnier <monnier@iro.umontreal.ca>
14 15
diff --git a/lisp/window.el b/lisp/window.el
index 67a80a6a2ec..211d8573e0c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5009,7 +5009,8 @@ argument of `display-buffer'."
5009 ;; A macro specifier. 5009 ;; A macro specifier.
5010 (cdr entry)) 5010 (cdr entry))
5011 ((or (display-buffer-other-window-means-other-frame buffer-name label) 5011 ((or (display-buffer-other-window-means-other-frame buffer-name label)
5012 (with-no-warnings (not pop-up-frames))) 5012 (with-no-warnings pop-up-frames))
5013 ;; Pop up another frame.
5013 (cdr (assq 'other-frame display-buffer-macro-specifiers))) 5014 (cdr (assq 'other-frame display-buffer-macro-specifiers)))
5014 (t 5015 (t
5015 ;; In any other case pop up a new window. 5016 ;; In any other case pop up a new window.