# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1287867764 25200
# Node ID 7f7432fcea564b725ece3c1d5a18b91cf1904de5
# Parent  6fc1cc9c6bfd6fa6581d9fddd056102d61d295fc
Sync docs of C and Lisp version of auto-hscroll-mode.

* lisp/frame.el (auto-hscroll-mode): Sync doc with C version.
* src/xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Sync doc with Lisp.

diff -r 6fc1cc9c6bfd -r 7f7432fcea56 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 23 13:43:59 2010 -0700
+++ b/lisp/ChangeLog	Sat Oct 23 14:02:44 2010 -0700
@@ -1,5 +1,7 @@
 2010-10-23  Glenn Morris  <rgm@gnu.org>
 
+	* frame.el (auto-hscroll-mode): Sync doc with C version.
+
 	* term/ns-win.el (xw-defined-colors):
 	* term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
 
diff -r 6fc1cc9c6bfd -r 7f7432fcea56 lisp/frame.el
--- a/lisp/frame.el	Sat Oct 23 13:43:59 2010 -0700
+++ b/lisp/frame.el	Sat Oct 23 14:02:44 2010 -0700
@@ -1,7 +1,8 @@
 ;;; frame.el --- multi-frame management independent of window systems
 
 ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1483,7 +1484,7 @@
   :group 'frames)
 
 (defcustom auto-hscroll-mode t
-  "Allow or disallow automatic scrolling windows horizontally.
+  "Allow or disallow automatic horizontal scrolling of windows.
 If non-nil, windows are automatically scrolled horizontally to make
 point visible."
   :version "21.1"
@@ -1615,5 +1616,4 @@
 
 (provide 'frame)
 
-;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56
 ;;; frame.el ends here
diff -r 6fc1cc9c6bfd -r 7f7432fcea56 src/ChangeLog
--- a/src/ChangeLog	Sat Oct 23 13:43:59 2010 -0700
+++ b/src/ChangeLog	Sat Oct 23 14:02:44 2010 -0700
@@ -1,3 +1,7 @@
+2010-10-23  Glenn Morris  <rgm@gnu.org>
+
+	* xdisp.c (syms_of_xdisp) <auto-hscroll-mode>: Sync doc with Lisp.
+
 2010-10-23  Eli Zaretskii  <eliz@gnu.org>
 
 	Implement mouse highlight for bidi-reordered lines.
@@ -28278,10 +28282,10 @@
 
 ;; Local Variables:
 ;; coding: utf-8
-;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+  Copyright (C) 2007, 2008, 2009, 2010
+    Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -28298,4 +28302,3 @@
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-;; arch-tag: dfb6ad96-1550-4905-9e53-d2059ee84c40
diff -r 6fc1cc9c6bfd -r 7f7432fcea56 src/xdisp.c
--- a/src/xdisp.c	Sat Oct 23 13:43:59 2010 -0700
+++ b/src/xdisp.c	Sat Oct 23 14:02:44 2010 -0700
@@ -1,8 +1,8 @@
 /* Display generation from window structure and buffer text.
-   Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
-                 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006, 2007, 2008, 2009, 2010
-                 Free Software Foundation, Inc.
+
+Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998,
+  1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+  2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -26464,7 +26464,9 @@
   Vblink_cursor_alist = Qnil;
 
   DEFVAR_BOOL ("auto-hscroll-mode", &automatic_hscrolling_p,
-    doc: /* *Non-nil means scroll the display automatically to make point visible.  */);
+    doc: /* Allow or disallow automatic horizontal scrolling of windows.
+If non-nil, windows are automatically scrolled horizontally to make
+point visible.  */);
   automatic_hscrolling_p = 1;
   Qauto_hscroll_mode = intern_c_string ("auto-hscroll-mode");
   staticpro (&Qauto_hscroll_mode);
@@ -26706,5 +26708,3 @@
 }
 #endif /* ! WINDOWSNT  */
 
-/* arch-tag: eacc864d-bb6a-4b74-894a-1a4399a1358b
-   (do not change this comment) */