From d39077108bb90d60a7ffcba6bb62c942230a7db5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 12 Jun 2002 17:32:52 +0000 Subject: [PATCH] (pop3-open-server): Fix typo. (pop3-munge-message-separator): Work if no date. Trivial patch from Marius Vollmer . (pop3-munge-message-separator): Only use valid date. Trivial patch from Michael Welsh Duggan . (pop3-md5): Don't hardcode point-min == 1. --- lisp/gnus/pop3.el | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index 99148388aa8..192c8f332dd 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -1,6 +1,6 @@ ;;; pop3.el --- Post Office Protocol (RFC 1460) interface -;; Copyright (C) 1996, 1997, 1998, 1999, 2000 +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 ;; Free Software Foundation, Inc. ;; Author: Richard L. Pieri @@ -139,7 +139,7 @@ Returns the process associated with the connection." mailhost))) (erase-buffer) (setq pop3-read-point (point-min)) - (setq process (open-network-stream "POP"(current-buffer) mailhost port)) + (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) @@ -244,18 +244,23 @@ If NOW, use that time instead." (looking-at "\001\001\001\001\n") ; MMDF (looking-at "BABYL OPTIONS:") ; Babyl )) - (let ((from (mail-strip-quoted-names (mail-fetch-field "From"))) - (date (split-string (or (mail-fetch-field "Date") - (pop3-make-date)) - " ")) - (From_)) + (let* ((from (mail-strip-quoted-names (mail-fetch-field "From"))) + (tdate (mail-fetch-field "Date")) + (date (split-string (or (and tdate + (not (string= "" tdate)) + tdate) + (pop3-make-date)) + " ")) + (From_)) ;; sample date formats I have seen ;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT) ;; Date: 08 Jul 1996 23:22:24 -0400 ;; should be ;; Tue Jul 9 09:04:21 1996 (setq date - (cond ((string-match "[A-Z]" (nth 0 date)) + (cond ((not date) + "Tue Jan 1 00:00:0 1900") + ((string-match "[A-Z]" (nth 0 date)) (format "%s %s %s %s %s" (nth 0 date) (nth 2 date) (nth 1 date) (nth 4 date) (nth 3 date))) @@ -332,7 +337,7 @@ If NOW, use that time instead." t (current-buffer) nil) ;; The meaningful output is the first 32 characters. ;; Don't return the newline that follows them! - (buffer-substring 1 33))))) + (buffer-substring (point-min) (+ 32 (point-min))))))) (defun pop3-stat (process) "Return the number of messages in the maildrop and the maildrop's size." -- 2.39.5