(gnus-sort-threads, gnus-summary-limit-children): Use `max'

to avoid the value of `max-lisp-eval-depth' decreasing.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 60d224fb0fa732570c4f38017e4c9f0f825b081d..eb324178b7d9ceb16f81a49ed47ffc20b34afd2e 100644 (file)
--- 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\e,Ad\e(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 0e43c78e3a8d8e5f3fcfed04fd553fe862a73109..05d5614756b4595ef9aa3de5a1afe53d70e93e9c 100644 (file)
--- 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