Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-539

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-21
   Merge from emacs--cvs-trunk--0

 * 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

4 files changed, 33 insertions, 20 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0f0f4697c47..5d3e2fa8957 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * nnimap.el (nnimap-open-connection): allow 'imaps' as a synonym
+        for the 'imap' port in netrc files
+
+        * gnus-registry.el (gnus-registry-trim): watch out for negatives
+        in gnus-registry-trim
+
+2004-09-10  Simon Josefsson  <jas@extundo.com>
+
+        * nndb.el (require): Remove tcp and duplicate cl.
+
 2004-09-08  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * nntp.el (nntp): New customization group.
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9a8d77d3b24..33238ef4552 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -266,25 +266,27 @@ 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)))
+    (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)))
       (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
       (setq alist
-            (nthcdr
-             (- (length alist) gnus-registry-max-entries)
-             (sort alist 
-                   (lambda (a b)
-                     (time-less-p 
-                      (cdr (gethash (car a) timehash))
-                      (cdr (gethash (car b) timehash))))))))))
+            (nthcdr
+             trim-length
+             (sort alist 
+                   (lambda (a b)
+                     (time-less-p 
+                      (cdr (gethash (car a) timehash))
+                      (cdr (gethash (car b) timehash))))))))))
 
 (defun alist-to-hashtable (alist)
   "Build a hashtable from the values in ALIST."
diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el
index d29d16fa690..bd8523f11b2 100644
--- a/lisp/gnus/nndb.el
+++ b/lisp/gnus/nndb.el
@@ -1,6 +1,6 @@
 ;;; nndb.el --- nndb access for Gnus
 
-;; Copyright (C) 1997, 1998, 2000, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;         Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
@@ -60,12 +60,6 @@
 (eval-when-compile (require 'cl))
 
 (eval-and-compile
-  (unless (fboundp 'open-network-stream)
-    (require 'tcp)))
-
-(eval-when-compile (require 'cl))
-
-(eval-and-compile
   (autoload 'news-setup "rnewspost")
   (autoload 'news-reply-mode "rnewspost")
   (autoload 'cancel-timer "timer")
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index fc33b9a48eb..782e987862b 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -723,10 +723,15 @@ If EXAMINE is non-nil the group is selected read-only."
                      (int-to-string nnimap-server-port)
                    "imap"))
            (alist (or (gnus-netrc-machine list server port "imap")
+                      (gnus-netrc-machine list server port "imaps")
                       (gnus-netrc-machine list
                                           (or nnimap-server-address
                                               nnimap-address)
-                                          port "imap")))
+                                          port "imap"))
+                      (gnus-netrc-machine list
+                                          (or nnimap-server-address
+                                              nnimap-address)
+                                          port "imaps")))
            (user (gnus-netrc-get alist "login"))
            (passwd (gnus-netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)