Import changes from current Gnus.

(pop3-open-server): Bind coding systems before creating buffer and
fix creating its name.
(pop3-string-to-list): Function deleted.  Change callers to use
split-string.

2 files changed, 24 insertions, 36 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b4e5a3f6d3e..7cd2d0af6a1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-08  Dave Love  <fx@gnu.org>
+
+        * pop3.el: Import changes from current Gnus.
+        (pop3-open-server): Bind coding systems before creating buffer and
+        fix creating its name.
+        (pop3-string-to-list): Function deleted.  Change callers to use
+        split-string.
+
 1999-12-19  Dave Love  <fx@gnu.org>
 
         * mail/pop3.el (pop3-movemail-file-coding-system): Doc fix.
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 1ea3b0a2c74..9b75b120242 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -114,25 +114,20 @@ Used for APOP authentication.")
 (defun pop3-open-server (mailhost port)
   "Open TCP connection to MAILHOST on PORT.
 Returns the process associated with the connection."
-  (let ((process-buffer
-         (get-buffer-create (format "trace of POP session to %s" mailhost)))
-        (process)
-        (coding-system-for-read 'binary)
+  (let ((coding-system-for-read 'binary)
         (coding-system-for-write 'binary)
-    )
+        process)
     (save-excursion
-      (set-buffer process-buffer)
+      (set-buffer (get-buffer-create (concat " trace of POP session to "
+                                             mailhost)))
       (erase-buffer)
       (setq pop3-read-point (point-min))
-      )
-    (setq process
-          (open-network-stream "POP" process-buffer mailhost port))
-    (let ((response (pop3-read-response process t)))
-      (setq pop3-timestamp
-            (substring response (or (string-match "<" response) 0)
-                       (+ 1 (or (string-match ">" response) -1)))))
-    process
-    ))
+      (setq process (open-network-stream "POP"(current-buffer) mailhost port))
+      (let ((response (pop3-read-response process t)))
+        (setq pop3-timestamp
+              (substring response (or (string-match "<" response) 0)
+                         (+ 1 (or (string-match ">" response) -1)))))
+      process)))
 
 ;; Support functions
 
@@ -176,22 +171,6 @@ Return the response string if optional second argument is non-nil."
             t)
           )))))
 
-(defun pop3-string-to-list (string &optional regexp)
-  "Chop up a string into a list."
-  (let ((list)
-        (regexp (or regexp " "))
-        (string (if (string-match "\r" string)
-                    (substring string 0 (match-beginning 0))
-                  string)))
-    (store-match-data nil)
-    (while string
-      (if (string-match regexp string)
-          (setq list (cons (substring string 0 (- (match-end 0) 1)) list)
-                string (substring string (match-end 0)))
-        (setq list (cons string list)
-              string nil)))
-    (nreverse list)))
-
 (defvar pop3-read-passwd nil)
 (defun pop3-read-passwd (prompt)
   (if (not pop3-read-passwd)
@@ -227,8 +206,9 @@ Return the response string if optional second argument is non-nil."
                    (looking-at "BABYL OPTIONS:") ; Babyl
                    ))
           (let ((from (mail-strip-quoted-names (mail-fetch-field "From")))
-                (date (pop3-string-to-list (or (mail-fetch-field "Date")
-                                               (message-make-date))))
+                (date (split-string (or (mail-fetch-field "Date")
+                                        (message-make-date))
+                                    " "))
                 (From_))
             ;; sample date formats I have seen
             ;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT)
@@ -314,8 +294,8 @@ Return the response string if optional second argument is non-nil."
   "Return the number of messages in the maildrop and the maildrop's size."
   (pop3-send-command process "STAT")
   (let ((response (pop3-read-response process t)))
-    (list (string-to-int (nth 1 (pop3-string-to-list response)))
-          (string-to-int (nth 2 (pop3-string-to-list response))))
+    (list (string-to-int (nth 1 (split-string response " ")))
+          (string-to-int (nth 2 (split-string response " "))))
     ))
 
 (defun pop3-list (process &optional msg)
@@ -377,7 +357,7 @@ This function currently does nothing.")
   "Return highest accessed message-id number for the session."
   (pop3-send-command process "LAST")
   (let ((response (pop3-read-response process t)))
-    (string-to-int (nth 1 (pop3-string-to-list response)))
+    (string-to-int (nth 1 (split-string response " ")))
     ))
 
 (defun pop3-rset (process)