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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1401b1b38accac594b7937eb424d66033c32afb..32806b24ea4925afddea73d457e51a84d714186c 100644 (file)
--- 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 b911e9f1768659befa8910ade8489eeef27d3136..417f0b411c528e28728ee4f44c3d60d06cba5bf8 100644 (file)
--- 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.