[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3194809 5/8: emacs-lisp/easy-mmode.el: Process macr
From: |
Artur Malabarba |
Subject: |
[Emacs-diffs] master 3194809 5/8: emacs-lisp/easy-mmode.el: Process macro arguments correctly |
Date: |
Tue, 17 Feb 2015 23:17:57 +0000 |
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))
- [Emacs-diffs] master updated (16d91bc -> 8338e44), Artur Malabarba, 2015/02/17
- [Emacs-diffs] master 77052f4 2/8: * help-mode.el: Prevent duplicated display of Info buffer. (Bug#13190), Artur Malabarba, 2015/02/17
- [Emacs-diffs] master cec04fb 1/8: * src/keyboard.c (timer_check_2): Fix incorrect comment, Artur Malabarba, 2015/02/17
- [Emacs-diffs] master 1e00ee2 3/8: desktop.el: Conditionally re-enable desktop autosave, Artur Malabarba, 2015/02/17
- [Emacs-diffs] master 1f2c4f8 4/8: emacs-lisp/package-x.el: Create valid tar files, Artur Malabarba, 2015/02/17
- [Emacs-diffs] master 3194809 5/8: emacs-lisp/easy-mmode.el: Process macro arguments correctly,
Artur Malabarba <=
- [Emacs-diffs] master 0409684 7/8: emacs-lisp/easy-mmode.el: Clarify mode switch messages, Artur Malabarba, 2015/02/17
- [Emacs-diffs] master cc273d1 6/8: emacs-lisp/easy-mmode.el (define-minor-mode): Clarify docs, Artur Malabarba, 2015/02/17
- [Emacs-diffs] master 8338e44 8/8: lisp/files.el (insert-file-contents-literally): Fix typo, Artur Malabarba, 2015/02/17