From 3194809d247efdc7ea65644ea7b298885e47a392 Mon Sep 17 00:00:00 2001 From: Kelly Dean Date: Mon, 16 Feb 2015 04:21:06 +0000 Subject: [PATCH] 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 deletion(-) 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 + + * emacs-lisp/easy-mmode.el (define-minor-mode): Process macro + arguments correctly. (Bug#19685) + 2015-02-16 Kelly Dean * 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)) -- 2.39.2