Partially revert previous define-minor-mode change

* lisp/emacs-lisp/easy-mmode.el (easy-mmode--arg-docstring):
Only document the values we want to support, not the ones we
actually support.
(define-minor-mode): Partially revert to previous behaviour.

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 77f10e61c6cb810c3af405bd39535b91f101c5f7..261f2508af766e2596e000ac28fa9744ff1e10ef 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -90,7 +90,7 @@ the mode.
 
 If called from Lisp, toggle the mode if ARG is `toggle'.
 Enable the mode if ARG is nil, omitted, or is a positive number.
-All other values will disable the mode.
+Disable the mode if ARG is a negative number.
 
 The mode's hook is called both when the mode is enabled and when
 it is disabled.")
@@ -312,12 +312,10 @@ or call the function `%s'."))))
             (cond ((eq arg 'toggle)
                    (not ,getter))
                   ((and (numberp arg)
-                        (> arg 0))
-                   t)
-                  ((eq arg nil)
-                   t)
+                        (< arg 1))
+                   nil)
                   (t
-                   nil)))
+                   t)))
            ,@body
            ;; The on/off hooks are here for backward compatibility only.
            (run-hooks ',hook (if ,getter ',hook-on ',hook-off))

diff --git a/test/lisp/emacs-lisp/easy-mmode-tests.el b/test/lisp/emacs-lisp/easy-mmode-tests.el
index 4a448200a2bd4d46b5571e2cdcc9c3b1a58d71b3..c05379e441515347cb509ab672e5b4d6039359f3 100644 (file)
--- a/test/lisp/emacs-lisp/easy-mmode-tests.el
+++ b/test/lisp/emacs-lisp/easy-mmode-tests.el
@@ -48,22 +48,16 @@
   (with-temp-buffer
     (define-minor-mode test-mode "A test.")
     (should (eq test-mode nil))
-    (test-mode t)
-    (should (eq test-mode nil))
     (test-mode nil)
     (should (eq test-mode t))
     (test-mode -33)
     (should (eq test-mode nil))
     (test-mode 33)
     (should (eq test-mode t))
-    (test-mode 0)
-    (should (eq test-mode nil))
-    (test-mode 'toggle)
-    (should (eq test-mode t))
     (test-mode 'toggle)
     (should (eq test-mode nil))
-    (test-mode "what")
-    (should (eq test-mode nil))))
+    (test-mode 'toggle)
+    (should (eq test-mode t))))
 
 (provide 'easy-mmode-tests)