Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org

[bpt/emacs.git] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index d57bd4e..9557dbf 100644 (file)
--- 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)