diff options
| author | Glenn Morris <[email protected]> | 2010-10-23 14:02:44 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2010-10-23 14:02:44 -0700 |
| commit | f3d87560bad3428c61d763a02e8a3a6b66d5d45a (patch) | |
| tree | 81d3718b65987e100877796925c54b150e30741d /lisp | |
| parent | 3193e969dfd6f48fc5d39e7f6486280de7d2f09d (diff) | |
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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/frame.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b05951f54f..296badae59 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2010-10-23 Glenn Morris <[email protected]> + * 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 --git a/lisp/frame.el b/lisp/frame.el index 44ac5c0e81..82feab16f0 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -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 @@ This is done in the face `trailing-whitespace'." :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 @@ Use Custom to set this variable to get the display updated." (provide 'frame) -;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56 ;;; frame.el ends here |