From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Wed, 4 Nov 2015 14:22:27 +0000 (+0000)
Subject: Revert "* lisp/subr.el (when): Use `macroexp-progn'"
X-Git-Tag: emacs-25.0.90~921
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39355bc045874874eb83cecdf2e2e04c3b81d3f7;p=emacs.git

Revert "* lisp/subr.el (when): Use `macroexp-progn'"

This reverts commit 8e843831eaf271801836b7a3e4dd3b4fb0bb72b8.
It breaks bootstrapping (duh).
---

diff --git a/lisp/subr.el b/lisp/subr.el
index 91647a67648..ea926ae1475 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -179,7 +179,7 @@ value of last one, or nil if there are none.
 
 \(fn COND BODY...)"
   (declare (indent 1) (debug t))
-  (list 'if cond (macroexp-progn body)))
+  (list 'if cond (cons 'progn body)))
 
 (defmacro unless (cond &rest body)
   "If COND yields nil, do BODY, else return nil.