aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2004-09-09 02:10:48 +0000
committerRichard M. Stallman <[email protected]>2004-09-09 02:10:48 +0000
commit6cb4a8923202a1f00fcbd2f7e3b8e0ee9e9bd3f4 (patch)
tree4e3083cc344fcb15ee7a4ee5f95054a51bcc24a4
parente8e8c0c7b70441f7238e6b3111494729eb56d786 (diff)
(Fset_window_buffer): Doc fix.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/window.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 57f51c6434..5242693956 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2004-09-08 Richard M. Stallman <[email protected]>
+ * window.c (Fset_window_buffer): Doc fix.
+
* xdisp.c (Fformat_mode_line): New arg BUFFER says which buffer to use.
2004-09-08 Dan Nicolaescu <[email protected]>
diff --git a/src/window.c b/src/window.c
index 463c8f1f1b..c696d7f9e2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3057,7 +3057,9 @@ BUFFER can be a buffer or the name of an existing buffer.
Optional third arg KEEP-MARGINS non-nil means that WINDOW's current
display margins, fringe widths, and scroll bar settings are maintained;
the default is to reset these from BUFFER's local settings or the frame
-defaults. */)
+defaults.
+
+This function runs the hook `window-scroll-functions'. */)
(window, buffer, keep_margins)
register Lisp_Object window, buffer, keep_margins;
{