From 0d3ff3756cdb68b973ec6921104d56e44ae96e79 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 10 Sep 2011 15:31:05 -0400 Subject: [PATCH] window.el (display-buffer--maybe-same-window): Renamed from display-buffer-maybe-same-window. --- lisp/ChangeLog | 2 ++ lisp/window.el | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c13236489d..02866c80152 100644 --- 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 91412cd5498..2afd608907d 100644 --- 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, -- 2.39.2