aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman <[email protected]>2002-01-08 23:57:49 +0000
committerRichard M. Stallman <[email protected]>2002-01-08 23:57:49 +0000
commite3b2eba1b6fd0af559d597a9b1832678b10db4e3 (patch)
tree8da9c988a2e8dc6f9462c97b3e28f9dd46728228
parent5c2012be06c6a9d524e0d26781ac43b87bfcc19b (diff)
(eldoc-minor-mode-string): Fix custom type.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/emacs-lisp/eldoc.el6
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6d3e0bd2dc..d7666677ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-08 Richard M. Stallman <[email protected]>
+
+ * emacs-lisp/eldoc.el (eldoc-minor-mode-string): Fix custom type.
+
+ * textmodes/flyspell.el (flyspell-mode-line-string): Fix custom type.
+
2002-01-08 Pavel Jan,Bm(Bk <[email protected]>
* progmodes/ada-mode.el (ada-initialize-properties, ada-mode): Do
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 4b86f0d08e..042b93886c 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -7,7 +7,7 @@
;; Keywords: extensions
;; Created: 1995-10-06
-;; $Id: eldoc.el,v 1.18 2000/12/02 20:10:49 schwab Exp $
+;; $Id: eldoc.el,v 1.19 2001/11/16 23:58:48 monnier Exp $
;; This file is part of GNU Emacs.
@@ -70,8 +70,8 @@ If this variable is set to 0, no idle time is required."
;;;###autoload
(defcustom eldoc-minor-mode-string " ElDoc"
- "*String to display in mode line when Eldoc Mode is enabled."
- :type 'string
+ "*String to display in mode line when Eldoc Mode is enabled; nil for none."
+ :type '(choice string (const :tag "None" nil))
:group 'eldoc)
(defcustom eldoc-argument-case 'upcase