summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-15 16:55:52 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-15 16:55:52 -0700
commit20a14f94f6581d5c483a7df775cd129bdc9e20d5 (patch)
tree269ebf3b2752db0cb26bfdd0a8f6a7f47d5cd285 /lisp/emacs-lisp
parent899b41b6e37a321e14559d2cf3c05ea3f8063811 (diff)
parentd55c12ed1f80711ef27a52fa0ba6e366f0b7a585 (diff)
downloademacs-20a14f94f6581d5c483a7df775cd129bdc9e20d5.tar.gz
emacs-20a14f94f6581d5c483a7df775cd129bdc9e20d5.tar.bz2
emacs-20a14f94f6581d5c483a7df775cd129bdc9e20d5.zip
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/easy-mmode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 88698a1f069..0d6716a2e63 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -260,7 +260,7 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'.
;; repeat-command still does the toggling correctly.
(interactive (list (or current-prefix-arg 'toggle)))
(let ((,last-message (current-message)))
- (,@(if setter (list setter)
+ (,@(if setter `(funcall #',setter)
(list (if (symbolp mode) 'setq 'setf) mode))
(if (eq arg 'toggle)
(not ,mode)