diff options
| author | Glenn Morris | 2010-10-23 14:02:44 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-23 14:02:44 -0700 |
| commit | f3d87560bad3428c61d763a02e8a3a6b66d5d45a (patch) | |
| tree | 81d3718b65987e100877796925c54b150e30741d /lisp | |
| parent | 3193e969dfd6f48fc5d39e7f6486280de7d2f09d (diff) | |
| download | emacs-f3d87560bad3428c61d763a02e8a3a6b66d5d45a.tar.gz emacs-f3d87560bad3428c61d763a02e8a3a6b66d5d45a.zip | |
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 b05951f54f6..296badae594 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-10-23 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-23 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * frame.el (auto-hscroll-mode): Sync doc with C version. | ||
| 4 | |||
| 3 | * term/ns-win.el (xw-defined-colors): | 5 | * term/ns-win.el (xw-defined-colors): |
| 4 | * term/x-win.el (xw-defined-colors): Make docs identical to w32-win. | 6 | * term/x-win.el (xw-defined-colors): Make docs identical to w32-win. |
| 5 | 7 | ||
diff --git a/lisp/frame.el b/lisp/frame.el index 44ac5c0e81d..82feab16f0d 100644 --- a/lisp/frame.el +++ b/lisp/frame.el | |||
| @@ -1,7 +1,8 @@ | |||
| 1 | ;;; frame.el --- multi-frame management independent of window systems | 1 | ;;; frame.el --- multi-frame management independent of window systems |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, | 3 | ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003, |
| 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4 | ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 5 | ;; Free Software Foundation, Inc. | ||
| 5 | 6 | ||
| 6 | ;; Maintainer: FSF | 7 | ;; Maintainer: FSF |
| 7 | ;; Keywords: internal | 8 | ;; Keywords: internal |
| @@ -1483,7 +1484,7 @@ This is done in the face `trailing-whitespace'." | |||
| 1483 | :group 'frames) | 1484 | :group 'frames) |
| 1484 | 1485 | ||
| 1485 | (defcustom auto-hscroll-mode t | 1486 | (defcustom auto-hscroll-mode t |
| 1486 | "Allow or disallow automatic scrolling windows horizontally. | 1487 | "Allow or disallow automatic horizontal scrolling of windows. |
| 1487 | If non-nil, windows are automatically scrolled horizontally to make | 1488 | If non-nil, windows are automatically scrolled horizontally to make |
| 1488 | point visible." | 1489 | point visible." |
| 1489 | :version "21.1" | 1490 | :version "21.1" |
| @@ -1615,5 +1616,4 @@ Use Custom to set this variable to get the display updated." | |||
| 1615 | 1616 | ||
| 1616 | (provide 'frame) | 1617 | (provide 'frame) |
| 1617 | 1618 | ||
| 1618 | ;; arch-tag: 82979c70-b8f2-4306-b2ad-ddbd6b328b56 | ||
| 1619 | ;;; frame.el ends here | 1619 | ;;; frame.el ends here |