emacs-lisp/easy-mmode.el: Process macro arguments correctly

* emacs-lisp/easy-mmode.el (define-minor-mode): Process macro
arguments correctly. (Bug#19685)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5080d92fd57dc646b30b884303fe6ab3df5f230..9741baa64bd4b4856d5fd8ae7d8c2da8364d2475 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-16  Kelly Dean  <kelly@prtime.org>
+
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro
+       arguments correctly. (Bug#19685)
+
 2015-02-16  Kelly Dean  <kelly@prtime.org>
 
        * emacs-lisp/package-x.el (package-upload-buffer-internal):

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index f7e8619948a2039507d4de5daa4b84d5f5fe27d3..cd5720d144f619c22c41d341ff51f52fd3d72297 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -159,7 +159,8 @@ For example, you could write
   ;; Allow skipping the first three args.
   (cond
    ((keywordp init-value)
-    (setq body `(,init-value ,lighter ,keymap ,@body)
+    (setq body (if keymap `(,init-value ,lighter ,keymap ,@body)
+                `(,init-value ,lighter))
          init-value nil lighter nil keymap nil))
    ((keywordp lighter)
     (setq body `(,lighter ,keymap ,@body) lighter nil keymap nil))