summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/easy-mmode.el8
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20a6e5e2bdf..ef4ead16b85 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-02 Eli Zaretskii <eliz@gnu.org>
+
+ * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Make
+ the lines in the generated doc string shorter. (Bug#4668)
+
2010-01-02 Ryan Yeske <rcyeske@gmail.com>
* net/rcirc.el: Add follow-link binding (Bug#4738).
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index bc97b07ddc3..704f8b15ebf 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -326,9 +326,13 @@ call another major mode in their body."
(make-variable-buffer-local ',MODE-major-mode)
;; The actual global minor-mode
(define-minor-mode ,global-mode
+ ;; Very short lines to avoid too long lines in the generated
+ ;; doc string.
,(format "Toggle %s in every possible buffer.
-With prefix ARG, turn %s on if and only if ARG is positive.
-%s is enabled in all buffers where `%s' would do it.
+With prefix ARG, turn %s on if and only if
+ARG is positive.
+%s is enabled in all buffers where
+\`%s' would do it.
See `%s' for more information on %s."
pretty-name pretty-global-name pretty-name turn-on
mode pretty-name)