Mercurial > emacs
diff lisp/cus-start.el @ 83492:203c9b24206b
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-153
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-154
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-155
Remove nick-abbrevs stuff from rcirc.el
* emacs@sv.gnu.org/emacs--devo--0--patch-156
rcirc.el update from Ryan Yeske
* emacs@sv.gnu.org/emacs--devo--0--patch-157
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-158
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-159
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-532
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 15 Mar 2006 17:22:12 +0000 |
parents | 428d132b4028 4c675b9920d8 |
children | 1321f6cfb389 |
line wrap: on
line diff
--- a/lisp/cus-start.el Sun Mar 12 05:02:59 2006 +0000 +++ b/lisp/cus-start.el Wed Mar 15 17:22:12 2006 +0000 @@ -52,7 +52,7 @@ (ctl-arrow display boolean) (truncate-lines display boolean) (selective-display-ellipses display boolean) - (indicate-empty-lines fringe boolean "21.1") + (indicate-empty-lines fringe boolean) (indicate-buffer-boundaries fringe (choice @@ -91,8 +91,7 @@ (const :tag "Do not show" (down . nil)) (const :tag "On the left" (down . left)) (const :tag "On the right" (down . right)))) - (other :tag "On left, no arrows" t)) - "22.1") + (other :tag "On left, no arrows" t))) (scroll-up-aggressively windows (choice (const :tag "off" nil) number) "21.1") @@ -174,7 +173,7 @@ (const :tag "always shown" t) (other :tag "hidden by keypress" 1))) ;; fringe.c - (overflow-newline-into-fringe fringe boolean "22.1") + (overflow-newline-into-fringe fringe boolean) ;; indent.c (indent-tabs-mode fill boolean) ;; keyboard.c