summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2006-12-06 11:16:44 +0000
committerJuanma Barranquero <lekktu@gmail.com>2006-12-06 11:16:44 +0000
commit04b61ae98d945468c2c1c0c4797abf9f08fdc8b9 (patch)
treed7f5d61d7eb4a912e74579cbda228eb0377409a8
parent9ac618de7ca5b18a21148682dc2380b3f377dede (diff)
downloademacs-04b61ae98d945468c2c1c0c4797abf9f08fdc8b9.tar.gz
(gnus-sort-threads, gnus-summary-limit-children): Use `max'
to avoid the value of `max-lisp-eval-depth' decreasing.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/gnus-sum.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60d224fb0fa..eb324178b7d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-06 Chris Moore <dooglus@gmail.com> (tiny change)
+
+ * gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children):
+ Use `max' to avoid the value of `max-lisp-eval-depth' decreasing.
+
2006-12-04 Jouni K. Sepp,Ad(Bnen <jks@iki.fi> (tiny change)
* mm-url.el (mm-url-predefined-programs): Call curl with correct
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 0e43c78e3a8..05d5614756b 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4561,7 +4561,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
(if (not gnus-thread-sort-functions)
threads
(gnus-message 8 "Sorting threads...")
- (let ((max-lisp-eval-depth 5000))
+ (let ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth)))
(prog1 (gnus-sort-threads-1
threads
(gnus-make-sort-function gnus-thread-sort-functions))
@@ -8165,7 +8165,7 @@ fetch-old-headers verbiage, and so on."
;; will really go down to a leaf article first, before slowly
;; working its way up towards the root.
(when thread
- (let* ((max-lisp-eval-depth 5000)
+ (let* ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth))
(children
(if (cdr thread)
(apply '+ (mapcar 'gnus-summary-limit-children