summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 2afd608907d..72cad635ab5 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4499,8 +4499,9 @@ BUFFER-OR-NAME and return that buffer."
(current-buffer)))
(defvar display-buffer-alist
- '(("\\`\\*\\(scheme\\|ielm\\|shell\\|\\(unsent \\)?mail\\|inferior-lisp\
-\\|Customiz.*\\|info\\|rlogin-.*\\|telnet-.*\\|rsh-.*\\|gud-.*\\)\\*\\(<[0-9]+>\\)?"
+ '(("\\`\\*\\(scheme\\|ielm\\|shell\\|\\(unsent \\)?mail\\|\
+inferior-lisp\\|Python\\|Customiz.*\\|info\\|rlogin-.*\\|\
+telnet-.*\\|rsh-.*\\|gud-.*\\)\\*\\(<[0-9]+>\\)?"
. (display-buffer-same-window)))
"Alist of conditional actions for `display-buffer'.
This is a list of elements (CONDITION . ACTION), where:
@@ -4565,7 +4566,7 @@ the same form as ALIST. See `display-buffer' for details.")
(put 'display-buffer--other-frame-action 'risky-local-variable t)
(defun display-buffer (&optional buffer-or-name action frame)
- "Display BUFFER-OR-NAME in some window.
+ "Display BUFFER-OR-NAME in some window, without selecting it.
BUFFER-OR-NAME must be a buffer or the name of an existing
buffer. Return the window chosen for displaying BUFFER-OR-NAME,
or nil if no such window is found.