summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-05-02 00:20:29 -0700
committerGlenn Morris <rgm@gnu.org>2012-05-02 00:20:29 -0700
commit90207a152538c00b6c75b9774b528470dfb42717 (patch)
tree6ee42e42631521d624a85d69dc914161309726b2 /lisp/window.el
parent6116bd7e7a88d47eb8bf0b830249461f47f8b943 (diff)
parentcd3771a08b8a1fed5aa91eb2ac559d41801668ea (diff)
downloademacs-90207a152538c00b6c75b9774b528470dfb42717.tar.gz
Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/window.el b/lisp/window.el
index d57bd4e2300..9557dbf057e 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4611,7 +4611,7 @@ The actual non-nil value of this variable will be copied to the
'(choice :tag "Function"
(const :tag "--" ignore) ; default for insertion
(const display-buffer-reuse-window)
- (const display-buffer-use-some-window)
+ (const display-buffer-pop-up-window)
(const display-buffer-same-window)
(const display-buffer-pop-up-frame)
(const display-buffer-use-some-window)