Commit f3d87560 authored by Glenn Morris's avatar Glenn Morris
Browse files

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.
parent 3193e969
2010-10-23 Glenn Morris <rgm@gnu.org> 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/ns-win.el (xw-defined-colors):
* term/x-win.el (xw-defined-colors): Make docs identical to w32-win. * term/x-win.el (xw-defined-colors): Make docs identical to w32-win.
   
......
;;; frame.el --- multi-frame management independent of window systems ;;; frame.el --- multi-frame management independent of window systems
;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, ;; 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 ;; Maintainer: FSF
;; Keywords: internal ;; Keywords: internal
...@@ -1483,7 +1484,7 @@ This is done in the face `trailing-whitespace'." ...@@ -1483,7 +1484,7 @@ This is done in the face `trailing-whitespace'."
:group 'frames) :group 'frames)
(defcustom auto-hscroll-mode t (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 If non-nil, windows are automatically scrolled horizontally to make
point visible." point visible."
:version "21.1" :version "21.1"
...@@ -1615,5 +1616,4 @@ Use Custom to set this variable to get the display updated." ...@@ -1615,5 +1616,4 @@ Use Custom to set this variable to get the display updated."
(provide 'frame) (provide 'frame)
;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56
;;; frame.el ends here ;;; frame.el ends here
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> 2010-10-23 Eli Zaretskii <eliz@gnu.org>
   
Implement mouse highlight for bidi-reordered lines. Implement mouse highlight for bidi-reordered lines.
...@@ -28278,10 +28282,10 @@ See ChangeLog.10 for earlier changes. ...@@ -28278,10 +28282,10 @@ See ChangeLog.10 for earlier changes.
   
;; Local Variables: ;; Local Variables:
;; coding: utf-8 ;; coding: utf-8
;; add-log-time-zone-rule: t
;; End: ;; 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. This file is part of GNU Emacs.
   
...@@ -28298,4 +28302,3 @@ See ChangeLog.10 for earlier changes. ...@@ -28298,4 +28302,3 @@ See ChangeLog.10 for earlier changes.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
   
;; arch-tag: dfb6ad96-1550-4905-9e53-d2059ee84c40
/* Display generation from window structure and buffer text. /* Display generation from window structure and buffer text.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
1997, 1998, 1999, 2000, 2001, 2002, 2003, Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997, 1998,
2004, 2005, 2006, 2007, 2008, 2009, 2010 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
Free Software Foundation, Inc. 2010 Free Software Foundation, Inc.
   
This file is part of GNU Emacs. This file is part of GNU Emacs.
   
...@@ -26464,7 +26464,9 @@ the frame's other specifications determine how to blink the cursor off. */); ...@@ -26464,7 +26464,9 @@ the frame's other specifications determine how to blink the cursor off. */);
Vblink_cursor_alist = Qnil; Vblink_cursor_alist = Qnil;
   
DEFVAR_BOOL ("auto-hscroll-mode", &automatic_hscrolling_p, 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; automatic_hscrolling_p = 1;
Qauto_hscroll_mode = intern_c_string ("auto-hscroll-mode"); Qauto_hscroll_mode = intern_c_string ("auto-hscroll-mode");
staticpro (&Qauto_hscroll_mode); staticpro (&Qauto_hscroll_mode);
...@@ -26706,5 +26708,3 @@ cancel_hourglass (void) ...@@ -26706,5 +26708,3 @@ cancel_hourglass (void)
} }
#endif /* ! WINDOWSNT */ #endif /* ! WINDOWSNT */
   
/* arch-tag: eacc864d-bb6a-4b74-894a-1a4399a1358b
(do not change this comment) */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment