Mercurial > emacs
diff lisp/cus-start.el @ 90599:c358d0861b16
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 414-422)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 128-130)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 05 Sep 2006 02:54:22 +0000 |
parents | 6823a91487f2 231eb88f2558 |
children | a1a25ac6c88a |
line wrap: on
line diff
--- a/lisp/cus-start.el Thu Aug 31 07:43:01 2006 +0000 +++ b/lisp/cus-start.el Tue Sep 05 02:54:22 2006 +0000 @@ -347,11 +347,11 @@ (scroll-step windows integer) (scroll-conservatively windows integer) (scroll-margin windows integer) - (hscroll-margin windows integer "21.3") - (hscroll-step windows number "21.3") + (hscroll-margin windows integer "22.1") + (hscroll-step windows number "22.1") (truncate-partial-width-windows display boolean) (mode-line-inverse-video modeline boolean) - (mode-line-in-non-selected-windows modeline boolean "21.3") + (mode-line-in-non-selected-windows modeline boolean "22.1") (line-number-display-limit display (choice integer (const :tag "No limit" nil))) @@ -373,8 +373,8 @@ (x-gtk-show-hidden-files menu boolean "22.1") (x-gtk-whole-detached-tool-bar x boolean "22.1") ;; xterm.c - (mouse-autoselect-window display boolean "21.3") - (x-use-underline-position-properties display boolean "21.3") + (mouse-autoselect-window display boolean "22.1") + (x-use-underline-position-properties display boolean "22.1") (x-underline-at-descent-line display boolean "22.1") (x-stretch-cursor display boolean "21.1"))) this symbol group type standard version native-p