Synch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a1dfdf..8e5fbb0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-03  Simon Josefsson  <jas@pdc.kth.se>
+
+       * nnimap.el (nnimap-open-connection): Don't look up virtual server
+       name in authinfo (.authinfo now support ports, no need for the
+       hack).
+       (nnimap-split-find-rule): Fix.
+
+2000-07-03  Paul Stodghill <stodghil@CS.Cornell.EDU>
+
+       * message.el (message-unquote-tokens): Remove all quotes.
+
 2000-07-03 00:29:08  Julien Gilles  <julien.gilles@bcv01y01.vz.cit.alcatel.fr>
 
        * gnus-ml.el: New file. 

diff --git a/lisp/message.el b/lisp/message.el
index 1de2986..ff5580a 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1398,12 +1398,12 @@ should be sent in several parts. If it is nil, the size is unlimited."
                  (progn (forward-line ,(or n 1)) (point))))
 
 (defun message-unquote-tokens (elems)
-  "Remove leading and trailing double quotes (\") from quoted strings
-in list."
+  "Remove double quotes (\") from strings in list."
   (mapcar (lambda (item)
-            (if (string-match "^\"\\(.*\\)\"$" item)
-                (match-string 1 item)
-              item))
+            (while (string-match "^\\(.*\\)\"\\(.*\\)$" item)
+              (setq item (concat (match-string 1 item) 
+                                 (match-string 2 item))))
+            item)
           elems))
 
 (defun message-tokenize-header (header &optional separator)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index 669e9f3..cfb7597 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -543,8 +543,8 @@ If EXAMINE is non-nil the group is selected read-only."
           (port (if nnimap-server-port
                     (int-to-string nnimap-server-port)
                   "imap"))
-          (alist (or (gnus-netrc-machine list server port "imap")
-                     (gnus-netrc-machine list nnimap-address port "imap")))
+          (alist (gnus-netrc-machine list (or nnimap-address server)
+                                      port "imap"))
           (user (gnus-netrc-get alist "login"))
           (passwd (gnus-netrc-get alist "password")))
       (if (imap-authenticate user passwd nnimap-server-buffer)
@@ -926,7 +926,9 @@ function is generally only called when Gnus is shutting down."
     element))
 
 (defun nnimap-split-find-rule (server inbox)
-  (if (listp (cadar nnimap-split-rule)) ;; extended format?
+  (if (and (listp nnimap-split-rule) (listp (car nnimap-split-rule))
+           (list (cdar nnimap-split-rule)) (listp (cadar nnimap-split-rule)))
+      ;; extended format
       (cadr (nnimap-assoc-match inbox (cdr (nnimap-assoc-match 
                                            server nnimap-split-rule))))
     nnimap-split-rule))