From: yamaoka <yamaoka>
Date: Thu, 24 Nov 2005 23:01:16 +0000 (+0000)
Subject: Synch to No Gnus 200511242300.
X-Git-Tag: t-gnus-6_17_4-quimby-~211
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=912d39c2d56815f296c9e9a990b09c3bfe85c4b2;p=elisp%2Fgnus.git-

Synch to No Gnus 200511242300.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6081093..a75eb65 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,8 @@
-2005-11-24  Pixel  <pixel@mandriva.com>  (tiny change)
+2005-11-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* pop3.el (pop3-open-server): Recognize a string as a service name.
+
+2005-11-24  Pascal Rigaux  <pixel@mandriva.com>  (tiny change)
 
 	* rfc2231.el (rfc2231-parse-string): Support non-ascii chars.
 
diff --git a/lisp/pop3.el b/lisp/pop3.el
index ad79d6b..657787d 100644
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -334,7 +334,7 @@ Argument PORT specifies connecting port."
        (cond
 	((or (eq pop3-connection-type 'ssl)
 	     (eq pop3-stream-type 'ssl)
-	     (and (not pop3-stream-type) (= port 995))) ; pop3s
+	     (and (not pop3-stream-type) (member port '(995 "pop3s"))))
 	 (pop3-open-ssl-stream "POP" (current-buffer) mailhost port))
 	((or (memq pop3-connection-type '(tls starttls))
 	     (memq pop3-stream-type '(tls starttls)))
diff --git a/lisp/rfc2231.el b/lisp/rfc2231.el
index f07d308..ca12c10 100644
--- a/lisp/rfc2231.el
+++ b/lisp/rfc2231.el
@@ -130,7 +130,9 @@ The list will be on the form
 			   (point)
 			   (progn
 			     (forward-sexp)
-			     ;; EXTENSION: Support non-ascii chars.
+			     ;; We might not have reached at the end of
+			     ;; the value because of non-ascii chars,
+			     ;; so we should jump over them if any.
 			     (while (and (not (eobp))
 					 (> (char-after) ?\177))
 			       (forward-char 1)