diff options
| author | Eli Zaretskii | 2012-06-09 12:15:13 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-06-09 12:15:13 +0300 |
| commit | 1e48e2823fca462b59d3aa23df99965c5f68f3f9 (patch) | |
| tree | a458cf1e617fbdd6a813740043ca776763b29704 | |
| parent | 4428609619012013fe869dd2b35b14eddbb1d338 (diff) | |
| download | emacs-1e48e2823fca462b59d3aa23df99965c5f68f3f9.tar.gz emacs-1e48e2823fca462b59d3aa23df99965c5f68f3f9.zip | |
Fix "lisp nesting exceeds max-lisp-eval-depth" errors on MS-Windows.
This happens during bootstrap; see bug#11649.
lisp/makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/makefile.w32-in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d75a1d52799..d053f74905b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-06-09 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * makefile.w32-in (BIG_STACK_DEPTH): Enlarge to 2200. (Bug#11649) | ||
| 4 | |||
| 1 | 2012-06-09 Chong Yidong <cyd@gnu.org> | 5 | 2012-06-09 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * face-remap.el (face-remap-add-relative, face-remap-set-base) | 7 | * face-remap.el (face-remap-add-relative, face-remap-set-base) |
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 6cb8b3dd495..cdfdf383de8 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in | |||
| @@ -70,7 +70,7 @@ AUTOGENEL = $(lisp)/loaddefs.el $(LOADDEFS) $(lisp)/cus-load.el \ | |||
| 70 | # During bootstrapping the byte-compiler is run interpreted when compiling | 70 | # During bootstrapping the byte-compiler is run interpreted when compiling |
| 71 | # itself, and uses more stack than usual. | 71 | # itself, and uses more stack than usual. |
| 72 | # | 72 | # |
| 73 | BIG_STACK_DEPTH = 1200 | 73 | BIG_STACK_DEPTH = 2200 |
| 74 | BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" | 74 | BIG_STACK_OPTS = --eval "(setq max-lisp-eval-depth $(BIG_STACK_DEPTH))" |
| 75 | 75 | ||
| 76 | BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) | 76 | BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) $(BYTE_COMPILE_EXTRA_FLAGS) |