2001-12-03 11:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* pop3.el (pop3-munge-message-separator): Only use valid date.
	From Michael Welsh Duggan <md5i@cs.cmu.edu>.

	* Makefile.in: gnus-load.elc may not be generated.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f0908d..6e1a9ba 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-03 11:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * pop3.el (pop3-munge-message-separator): Only use valid date.
+       From Michael Welsh Duggan <md5i@cs.cmu.edu>.
+
+       * Makefile.in: gnus-load.elc may not be generated.
+
 2001-12-03 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * mm-url.el: New.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 830034b..374a730 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -15,18 +15,18 @@ W3DIR = @W3@
 URLDIR = @URL@
 EMACS_COMP = URLDIR=$(URLDIR) W3DIR=$(W3DIR) lispdir=$(lispdir) srcdir=$(srcdir) $(EMACS) $(FLAGS)
 
-all total: clean-some gnus-load.elc
+all total: clean-some gnus-load.el
        $(EMACS_COMP) -f dgnushack-compile
 
 clean-some:
        rm -f *.elc gnus-load.el
 
-warn: clean-some gnus-load.elc
+warn: clean-some gnus-load.el
        $(EMACS_COMP) --eval '(dgnushack-compile t)' 2>&1 | egrep -v "variable G|inhibit-point-motion-hooks|coding-system|temp-results|variable gnus|variable nn|scroll-in-place|deactivate-mark|filladapt-mode|byte-code-function-p|print-quoted|ps-right-header|ps-left-header|article-inhibit|print-escape|ssl-program-arguments|message-log-max"
 
 # The "clever" rule is unsafe, since redefined macros are loaded from
 # .elc files, and not the .el file.
-clever some: gnus-load.elc
+clever some: gnus-load.el
        $(EMACS_COMP) -f dgnushack-compile
 
 install: install-el install-elc 
@@ -69,7 +69,7 @@ separately:
 pot:
        xpot -drgnus -r`cat ./version` *.el > rgnus.pot
 
-gnus-load.el gnus-load.elc:
+gnus-load.el:
        $(EMACS_COMP) -f dgnushack-make-cus-load $(srcdir)
        $(EMACS_COMP) -f dgnushack-make-auto-load $(srcdir)
        $(EMACS_COMP) -f dgnushack-make-load

diff --git a/lisp/pop3.el b/lisp/pop3.el
index 9bbc569..ce619c1 100644 (file)
--- a/lisp/pop3.el
+++ b/lisp/pop3.el
@@ -244,11 +244,14 @@ 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