(syms_of_xdisp): Mention set-window-buffer in

doc-string of window-scroll-functions.

diff --git a/src/ChangeLog b/src/ChangeLog
index f2b3786245a6871ea20b83d2680e3e8fad5ac5a7..0567f7bfb898b53d11ff3f87fba82aaee45bdbb3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-29  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.c (Fwindow_height, Fdelete_window, set_window_buffer)
+       (Fwindow_text_height): Clarify doc-strings.
+       * xdisp.c (syms_of_xdisp): Mention set-window-buffer in
+       doc-string of window-scroll-functions.
+
 2008-10-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * category.c (syms_of_category): Fix typo in docstring.

diff --git a/src/xdisp.c b/src/xdisp.c
index 5509d1e65ed041824b1efe18bae55295a74eb8d2..7814bac5195dc763ce0fb1f01d76a15df77db0b8 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25059,9 +25059,10 @@ all the functions in the list are called, with the frame as argument.  */);
 
   DEFVAR_LISP ("window-scroll-functions", &Vwindow_scroll_functions,
     doc: /* List of functions to call before redisplaying a window with scrolling.
-Each function is called with two arguments, the window
-and its new display-start position.  Note that the value of `window-end'
-is not valid when these functions are called.  */);
+Each function is called with two arguments, the window and its new
+display-start position.  Note that these functions are also called by
+`set-window-buffer'.  Also note that the value of `window-end' is not
+valid when these functions are called.  */);
   Vwindow_scroll_functions = Qnil;
 
   DEFVAR_LISP ("window-text-change-functions",