2 files changed, 8 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9814db91f20..941ded6b959 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-05  Eli Zaretskii  <eliz@is.elta.co.il>
+
+        * window.c (Fset_window_hscroll): Doc fix.
+
 2002-06-05  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
         * fileio.c (choose_write_coding_system): Call
diff --git a/src/window.c b/src/window.c
index f73c95bf973..ffe05bca982 100644
--- a/src/window.c
+++ b/src/window.c
@@ -439,7 +439,10 @@ DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0,
 
 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
        doc: /* Set number of columns WINDOW is scrolled from left margin to NCOL.
-NCOL should be zero or positive.  */)
+NCOL should be zero or positive.
+
+Note that if `automatic-hscrolling' is non-nil, you cannot scroll the
+window so that the location of point becomes invisible.  */)
      (window, ncol)
      Lisp_Object window, ncol;
 {