[Emacs-diffs] master 3194809 5/8: emacs-lisp/easy-mmode.el: Process macro arguments correctly

[Artur Malabarba]

branch: master
commit 3194809d247efdc7ea65644ea7b298885e47a392
Author: Kelly Dean <address@hidden>
Commit: Artur Malabarba <address@hidden>

    emacs-lisp/easy-mmode.el: Process macro arguments correctly
    
    * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro
    arguments correctly. (Bug#19685)
---
 lisp/ChangeLog                |    5 +++++
 lisp/emacs-lisp/easy-mmode.el |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5080d9..9741baa 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2015-02-16  Kelly Dean  <address@hidden>
 
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro
+       arguments correctly. (Bug#19685)
+
+2015-02-16  Kelly Dean  <address@hidden>
+
        * emacs-lisp/package-x.el (package-upload-buffer-internal):
        Create valid tar files. (Bug#19536)
 
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index f7e8619..cd5720d 100644
--- 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))