From: Miles Bader Date: Fri, 17 Sep 2004 07:40:15 +0000 (+0000) Subject: Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-107 X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=a867412adbc36b5303743ccd84e4efa6e39b5503;p=gnus Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-107 Merge from gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-22 Update from CVS: lisp/nndb.el (require): Remove tcp and duplicate cl. * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-23 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-24 lisp/nnimap.el (nnimap-open-connection): Remove extraneous end-paren * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-25 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-26 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-27 Use the same directory explicit id-tags as Emacs where possible * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-28 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-29 Update from CVS --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 211650ff0..67ca47d8d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2004-09-16 Reiner Steib + + * gnus-sum.el (gnus-fetch-old-headers): Added custom choices `t' + and `invisible'. + +2004-09-10 Teodor Zlatanov + + * gnus-registry.el (gnus-registry-trim): watch out for negatives + in gnus-registry-trim + 2004-09-13 Simon Josefsson * dns-mode.el: Add XEmacs auto-mode-alist autoload cookie. diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el index 4fcc7cd51..0acdb28e4 100644 --- a/lisp/gnus-registry.el +++ b/lisp/gnus-registry.el @@ -267,16 +267,16 @@ way." (defun gnus-registry-trim (alist) "Trim alist to size, using gnus-registry-max-entries." (if (null gnus-registry-max-entries) - alist ; just return the alist + alist ; just return the alist ;; else, when given max-entries, trim the alist (let* ((timehash (make-hash-table - :size 4096 - :test 'equal)) - (trim-length (- (length alist) gnus-registry-max-entries)) - (trim-length (if (natnump trim-length) trim-length 0))) + :size 4096 + :test 'equal)) + (trim-length (- (length alist) gnus-registry-max-entries)) + (trim-length (if (natnump trim-length) trim-length 0))) (maphash (lambda (key value) - (puthash key (gnus-registry-fetch-extra key 'mtime) timehash)) + (puthash key (gnus-registry-fetch-extra key 'mtime) timehash)) gnus-registry-hashtb) ;; we use the return value of this setq, which is the trimmed alist diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index af0737168..025646949 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -64,7 +64,7 @@ it will be killed sometime later." "*Non-nil means that Gnus will try to build threads by grabbing old headers. If an unread article in the group refers to an older, already read (or just marked as read) article, the old article will not normally be -displayed in the Summary buffer. If this variable is non-nil, Gnus +displayed in the Summary buffer. If this variable is t, Gnus will attempt to grab the headers to the old articles, and thereby build complete threads. If it has the value `some', only enough headers to connect otherwise loose threads will be displayed. This @@ -75,7 +75,9 @@ old headers will be fetched, but none will be displayed. The server has to support NOV for any of this to work." :group 'gnus-thread :type '(choice (const :tag "off" nil) + (const :tag "on" t) (const some) + (const invisible) number (sexp :menu-tag "other" t))) diff --git a/lisp/nndb.el b/lisp/nndb.el index 8d6122e61..bd8523f11 100644 --- a/lisp/nndb.el +++ b/lisp/nndb.el @@ -60,6 +60,10 @@ (eval-when-compile (require 'cl)) (eval-and-compile + (autoload 'news-setup "rnewspost") + (autoload 'news-reply-mode "rnewspost") + (autoload 'cancel-timer "timer") + (autoload 'telnet "telnet" nil t) (autoload 'telnet-send-input "telnet" nil t) (autoload 'gnus-declare-backend "gnus-start"))