aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorArtur Malabarba2015-11-04 12:54:53 +0000
committerArtur Malabarba2015-11-04 12:56:25 +0000
commit8e843831eaf271801836b7a3e4dd3b4fb0bb72b8 (patch)
treeee0c22b58dae03ad9c509f301e6a86f844a1a213 /lisp
parent587b2328377c32950a7ccf89f7c0b7d95db873af (diff)
downloademacs-8e843831eaf271801836b7a3e4dd3b4fb0bb72b8.tar.gz
emacs-8e843831eaf271801836b7a3e4dd3b4fb0bb72b8.zip
* lisp/subr.el (when): Use `macroexp-progn'
* test/automated/subr-tests.el (subr-test-when): New test
Diffstat (limited to 'lisp')
-rw-r--r--lisp/subr.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index ea926ae1475..91647a67648 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -179,7 +179,7 @@ value of last one, or nil if there are none.
179 179
180\(fn COND BODY...)" 180\(fn COND BODY...)"
181 (declare (indent 1) (debug t)) 181 (declare (indent 1) (debug t))
182 (list 'if cond (cons 'progn body))) 182 (list 'if cond (macroexp-progn body)))
183 183
184(defmacro unless (cond &rest body) 184(defmacro unless (cond &rest body)
185 "If COND yields nil, do BODY, else return nil. 185 "If COND yields nil, do BODY, else return nil.