From: Kelly Dean <kelly@prtime.org>
Date: Mon, 16 Feb 2015 04:21:06 +0000 (+0000)
Subject: emacs-lisp/easy-mmode.el: Process macro arguments correctly
X-Git-Tag: emacs-25.0.90~2564^2~361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3194809d247efdc7ea65644ea7b298885e47a392;p=emacs.git

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 d5080d92fd5..9741baa64bd 100644
--- 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 f7e8619948a..cd5720d144f 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))