[Emacs-diffs] /srv/bzr/emacs/trunk r105706: window.el (display-buffer--maybe-same-window): Renamed from display-buffer-maybe-same-window.

[Chong Yidong]

------------------------------------------------------------
revno: 105706
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-10 15:31:05 -0400
message:
  window.el (display-buffer--maybe-same-window): Renamed from 
display-buffer-maybe-same-window.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-10 18:52:37 +0000
+++ b/lisp/ChangeLog    2011-09-10 19:31:05 +0000
@@ -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:

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2011-09-10 18:52:37 +0000
+++ b/lisp/window.el    2011-09-10 19:31:05 +0000
@@ -4515,7 +4515,7 @@
 (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 @@
 
 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 @@
     (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,