summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2004-03-04 17:16:56 +0000
committerRichard M. Stallman <rms@gnu.org>2004-03-04 17:16:56 +0000
commit9a7e95f339c5e549e0fc4d928ed07b99486f945e (patch)
tree0d2f3f60352aef40b21c19f90b650886ef9057ab /src
parentae47339f7153f9ba2e8dfbbb8e1032f9f7979a77 (diff)
downloademacs-9a7e95f339c5e549e0fc4d928ed07b99486f945e.tar.gz
(Fdisplay_buffer): Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/window.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ea241bf542d..511a9fdaa96 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-04 Richard M. Stallman <rms@gnu.org>
+
+ * window.c (Fdisplay_buffer): Doc fix.
+
+ * buffer.c (Fpop_to_buffer): Doc fix.
+
2004-03-03 Kim F. Storm <storm@cua.dk>
* xdisp.c (display_line): Fix call to get_overlay_arrow_glyph_row.
diff --git a/src/window.c b/src/window.c
index bac6c5a7d92..626de53e21e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3268,9 +3268,10 @@ Returns the window displaying BUFFER.
If `display-buffer-reuse-frames' is non-nil, and another frame is currently
displaying BUFFER, then simply raise that frame.
-The variables `special-display-buffer-names', `special-display-regexps',
-`same-window-buffer-names', and `same-window-regexps' customize how certain
-buffer names are handled.
+The variables `special-display-buffer-names',
+`special-display-regexps', `same-window-buffer-names', and
+`same-window-regexps' customize how certain buffer names are handled.
+The latter two take effect only if NOT-THIS-WINDOW is t.
If optional argument FRAME is `visible', search all visible frames.
If FRAME is 0, search all visible and iconified frames.