From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 5 Jun 2002 16:57:59 +0000 (+0000)
Subject: (Fset_window_hscroll): Doc fix.
X-Git-Tag: emacs-pretest-21.2.91~238
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ca22a317103813cd981da86e40f41bc53ddc386;p=emacs.git

(Fset_window_hscroll): Doc fix.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2f072b7d088..8c8454dfe47 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-05-31  Gerd Moellmann  <gerd@gnu.org>
 
 	* xterm.c (x_get_char_face_and_encoding): Add parameter DISPLAY_P.
diff --git a/src/window.c b/src/window.c
index c58fd2f36b0..79ae64ff7e9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -428,7 +428,10 @@ DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0,
 
 DEFUN ("set-window-hscroll", Fset_window_hscroll, Sset_window_hscroll, 2, 2, 0,
   "Set number of columns WINDOW is scrolled from left margin to NCOL.\n\
-NCOL should be zero or positive.")
+NCOL should be zero or positive.\n\
+\n\
+Note that if `automatic-hscrolling' is non-nil, you cannot scroll the\n\
+window so that the location of point is not visible.")
   (window, ncol)
      Lisp_Object window, ncol;
 {