aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-11-28 14:26:39 +0800
committerChong Yidong2011-11-28 14:26:39 +0800
commite95def75e4a3fae3f5671cc828012388f0e251f5 (patch)
tree54d763741078b8a5bab249b935279507717c0468
parentdc95a8b0de5b4c823f838a66d6cdc74ea5be2ccb (diff)
downloademacs-e95def75e4a3fae3f5671cc828012388f0e251f5.tar.gz
emacs-e95def75e4a3fae3f5671cc828012388f0e251f5.zip
* emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/easy-mmode.el8
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ca29e33023..16f81a1729c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-11-28 Chong Yidong <cyd@gnu.org>
2
3 * emacs-lisp/easy-mmode.el (define-minor-mode): Fix default doc.
4
12011-11-27 Nick Roberts <nickrob@snap.net.nz> 52011-11-27 Nick Roberts <nickrob@snap.net.nz>
2 6
3 * progmodes/gdb-mi.el (gdb-init-1): Condition execution of 7 * progmodes/gdb-mi.el (gdb-init-1): Condition execution of
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index bf9f2c9d6ed..fae4d9adc38 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -233,10 +233,10 @@ or call the function `%s'."))))
233 (defun ,modefun (&optional arg ,@extra-args) 233 (defun ,modefun (&optional arg ,@extra-args)
234 ,(or doc 234 ,(or doc
235 (format (concat "Toggle %s on or off. 235 (format (concat "Toggle %s on or off.
236Interactively, with no prefix argument, toggle the mode. 236With a prefix argument ARG, enable %s if ARG is
237With universal prefix ARG turn mode on. 237positive, and disable it otherwise. If called from Lisp, enable
238With zero or negative ARG turn mode off. 238the mode if ARG is omitted or nil.
239\\{%s}") pretty-name keymap-sym)) 239\\{%s}") pretty-name pretty-name keymap-sym))
240 ;; Use `toggle' rather than (if ,mode 0 1) so that using 240 ;; Use `toggle' rather than (if ,mode 0 1) so that using
241 ;; repeat-command still does the toggling correctly. 241 ;; repeat-command still does the toggling correctly.
242 (interactive (list (or current-prefix-arg 'toggle))) 242 (interactive (list (or current-prefix-arg 'toggle)))