From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 22 Sep 2014 18:17:27 +0000 (-0400)
Subject: * lisp/loadup.el: Increase max-lisp-eval-depth while macroexpanding macroexp.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~252^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f8b25a5169905206935ebf49a9e99a7536106e46;p=emacs.git

* lisp/loadup.el: Increase max-lisp-eval-depth while macroexpanding macroexp.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1401b1b38a..32806b24ea4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-09-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* loadup.el: Increase max-lisp-eval-depth while macroexpanding macroexp.el.
+
 	* emacs-lisp/pcase.el: Allow (F . ARGS) in `app' patterns.
 	(pcase--funcall, pcase--eval): New functions.
 	(pcase--u1): Use them for guard, pred, let, and app.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index b911e9f1768..417f0b411c5 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -119,7 +119,8 @@
   (let ((macroexp--pending-eager-loads '(skip)))
     (load "emacs-lisp/pcase"))
   ;; Re-load macroexp so as to eagerly macro-expand its uses of pcase.
-  (load "emacs-lisp/macroexp"))
+  (let ((max-lisp-eval-depth (* 2 max-lisp-eval-depth)))
+    (load "emacs-lisp/macroexp")))
 
 (load "cus-face")
 (load "faces")  ; after here, `defface' may be used.