--- a/lisp/ChangeLog	Tue Feb 15 22:51:39 2005 +0000
+++ b/lisp/ChangeLog	Wed Feb 16 11:07:30 2005 +0000
@@ -1,3 +1,10 @@
+2005-02-16  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* buffer.el (pop-to-buffer):
+	* window-xemacs.el (display-buffer):
+	Document use of `same-window-buffer-names,' `same-window-regexps'
+	by pop-to-buffer and display-buffer. 
+	
 2005-02-09  Ben Wing  <ben@xemacs.org>
 
 	* dumped-lisp.el (preloaded-file-list):

--- a/lisp/buffer.el	Tue Feb 15 22:51:39 2005 +0000
+++ b/lisp/buffer.el	Wed Feb 16 11:07:30 2005 +0000
@@ -71,7 +71,12 @@
 another window even if BUFNAME is already visible in the selected window.
 If optional third arg is non-nil, it is the frame to pop to this
 buffer on.
-If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged."
+If `focus-follows-mouse' is non-nil, keyboard focus is left unchanged.
+
+Buffers with names that are members of the `same-window-buffer-names'
+list, or that match an element of the `same-window-regexps' list are
+treated specially by this function--they are always selected in the
+same window rather than in a different one."
   ;; #ifdef I18N3
   ;; #### Doc string should indicate that the buffer name will get
   ;; translated.

--- a/lisp/window-xemacs.el	Tue Feb 15 22:51:39 2005 +0000
+++ b/lisp/window-xemacs.el	Wed Feb 16 11:07:30 2005 +0000
@@ -701,6 +701,10 @@
 
 If `pop-up-frames' is non-nil, make a new frame if no window shows BUFFER.
 
+If the buffer name is a member of the `same-window-buffer-names' list,
+or matches one of the `same-window-regexps' expressions, display the
+buffer in the currently selected window.
+
 Returns the window displaying BUFFER."
   (interactive "BDisplay buffer:\nP")