aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/regexp-opt.el1
2 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7666677abc..01dd7bff8c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12002-01-08 Richard M. Stallman <rms@gnu.org> 12002-01-08 Richard M. Stallman <rms@gnu.org>
2 2
3 * emacs-lisp/regexp-opt.el (regexp-opt): Bind max-specpdl-size.
4
3 * emacs-lisp/eldoc.el (eldoc-minor-mode-string): Fix custom type. 5 * emacs-lisp/eldoc.el (eldoc-minor-mode-string): Fix custom type.
4 6
5 * textmodes/flyspell.el (flyspell-mode-line-string): Fix custom type. 7 * textmodes/flyspell.el (flyspell-mode-line-string): Fix custom type.
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 9e95eeb8fc9..e46ad2ca3e5 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -101,6 +101,7 @@ by \\=\\< and \\>."
101 (save-match-data 101 (save-match-data
102 ;; Recurse on the sorted list. 102 ;; Recurse on the sorted list.
103 (let* ((max-lisp-eval-depth (* 1024 1024)) 103 (let* ((max-lisp-eval-depth (* 1024 1024))
104 (max-specpdl-size (* 1024 1024))
104 (completion-ignore-case nil) 105 (completion-ignore-case nil)
105 (completion-regexp-list nil) 106 (completion-regexp-list nil)
106 (words (eq paren 'words)) 107 (words (eq paren 'words))