* src/eval.c (init_eval_once): Bump max_specpdl_size (bug46818)

Further testing seems to confirm my suspicion that the increase in the
specpdl comes from the recent change to `pcase--if`.

* lisp/international/mule-cmds.el (update-leim-list-file): Revert workaround.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index e1dbf82ed49bd2a489a6a5d55e20e45a8a468b60..e4bdf50f5265bcbd3b6f14610fb8df425cd60308 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1312,13 +1312,8 @@ Each function is called with one arg, LEIM directory name.")
 
 (defun update-leim-list-file (&rest dirs)
   "Update LEIM list file in directories DIRS."
-  ;; bug#46818: This `let'-binding is not necessary, but
-  ;; it reduces the recursion depth during bootstrap (at which
-  ;; point some of the core ELisp files haven't been byte-compiled
-  ;; yet, which causes deeper-than-normal recursion).
-  (let ((vc-handled-backends nil))
-    (dolist (function update-leim-list-functions)
-      (apply function dirs))))
+  (dolist (function update-leim-list-functions)
+    (apply function dirs)))
 
 (defvar-local current-input-method nil
   "The current input method for multilingual text.

diff --git a/src/eval.c b/src/eval.c
index 542d7f686e6ce30ad29c8a65cdcc829658a0a68c..ddaa8edd81706c4725136be35bdc9228b4a72b03 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -219,7 +219,7 @@ void
 init_eval_once (void)
 {
   /* Don't forget to update docs (lispref node "Local Variables").  */
-  max_specpdl_size = 1600; /* 1500 is not enough for cl-generic.el.  */
+  max_specpdl_size = 1800; /* See bug#46818.  */
   max_lisp_eval_depth = 800;
   Vrun_hooks = Qnil;
   pdumper_do_now_and_after_load (init_eval_once_for_pdumper);