mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

window.el (display-buffer--maybe-same-window): Renamed from display-buffer-maybe-same-window.

Browse Source
This commit is contained in:
Chong Yidong 2011-09-10 15:31:05 -04:00
parent 8319e0bf55
commit 0d3ff3756c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -19,6 +19,8 @@
(display-buffer-use-some-window): Don't perform any special
pop-up-frames handling.
(pop-to-buffer): Use window-normalize-buffer-to-switch-to.
(display-buffer--maybe-same-window): Renamed from
display-buffer-maybe-same-window.
* cus-edit.el:
* info.el:

5
lisp/window.el
View File

@ -4515,7 +4515,7 @@ This is a list of elements (CONDITION . ACTION), where:
(put 'display-buffer-alist 'risky-local-variable t)
(defvar display-buffer-default-action
'((display-buffer-maybe-same-window
'((display-buffer--maybe-same-window
display-buffer-reuse-window
display-buffer--special
display-buffer--maybe-pop-up-frame-or-window
@ -4585,7 +4585,6 @@ alist as the second argument, until a function returns non-nil.
Available action functions include:
`display-buffer-same-window'
`display-buffer-maybe-same-window'
`display-buffer-reuse-window'
`display-buffer-pop-up-frame'
`display-buffer-pop-up-window'
@ -4668,7 +4667,7 @@ selected window."
(display-buffer-record-window 'reuse-window (selected-window) buffer)
(window--display-buffer-2 buffer (selected-window))))
(defun display-buffer-maybe-same-window (buffer alist)
(defun display-buffer--maybe-same-window (buffer alist)
"Conditionally display BUFFER in the selected window.
If `same-window-p' returns non-nil for BUFFER's name, call
`display-buffer-same-window' and return its value. Otherwise,