2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d5080d92fd5..9741baa64bd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 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):
         Create valid tar files. (Bug#19536)
 
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))