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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c13236489de2959e07158a3de393cdea04a7834..02866c8015254695e56227fa632bc914f18b6ad2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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:

diff --git a/lisp/window.el b/lisp/window.el
index 91412cd54987c7e280d4953cf4a69180fe1ac79c..2afd608907d7c6b743227601a685c933692545fe 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -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,