(define-minor-mode): A nil argument to the minor mode turns the mode ON.

diff --git a/etc/NEWS b/etc/NEWS
index 5932d85dbc098f09ed604bf06f81c7d7799dbabd..ba254a3037075a1554009cafad72d69fbb10b087 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -140,6 +140,8 @@ Secret Service API requires D-Bus for communication.
 \f
 * Incompatible Lisp Changes in Emacs 24.1
 
+** Passing a nil argument to a minor mode function now turns the mode
+   ON unconditionally.
 \f
 * Lisp changes in Emacs 24.1
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05ecc80f7ebdf6fdae7a1f13906c6c5d50473e9e..48a88fd0d0af0362abd18da6a406c68c657a2264 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-13  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Passing a nil argument
+       to the minor mode function now turns the mode ON unconditionally.
+
 2010-04-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * vc-dir.el (vc-dir-kill-line): New command.

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 13e08667839e425ad85f0d65e73fb0101aed47e6..2849f4cf154b9ba6d0610ee9ac08a6c0414a192a 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -222,15 +222,10 @@ With zero or negative ARG turn mode off.
         (interactive (list (or current-prefix-arg 'toggle)))
         (let ((,last-message (current-message)))
            (setq ,mode
-                 (cond
-                  ((eq arg 'toggle) (not ,mode))
-                  (arg (> (prefix-numeric-value arg) 0))
-                  (t
-                   (if (null ,mode) t
-                     (message
-                      "Toggling %s off; better pass an explicit argument."
-                      ',mode)
-                     nil))))
+                 (if (eq arg 'toggle)
+                     (not ,mode)
+                   ;; A nil argument also means ON now.
+                   (> (prefix-numeric-value arg) 0)))
            ,@body
            ;; The on/off hooks are here for backward compatibility only.
            (run-hooks ',hook (if ,mode ',hook-on ',hook-off))