Merge from gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 534, 540, 544)

   - Merge from gnus--rel--5.10
   - Update from CVS

 * gnus--rel--5.10  (patch 172)

   - Merge from emacs--devo--0

2006-12-06  Chris Moore  <dooglus@gmail.com>  (tiny change)

   * lisp/gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children):
   Use `max' to avoid the value of `max-lisp-eval-depth' decreasing.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-250

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79fb3a2..39d43be 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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-sum.el b/lisp/gnus-sum.el
index f218fe3..6fe5a6e 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -4662,7 +4662,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))
@@ -8356,7 +8356,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