[gnus git] branch master updated: n0-13-32-gdd2e739

       via  dd2e73903175c6fbecaa3cfd673c5db527d5af43 (commit)
      from  dcc8c1aefc5eed4145e11416dfc0996e06833659 (commit)


- Log -----------------------------------------------------------------
commit dd2e73903175c6fbecaa3cfd673c5db527d5af43
Author: Julien Danjou <[email protected]>
Date:   Wed Feb 23 16:03:14 2011 +0100

    gnus-art: fix combined-lapsed with invalide date
    
    Signed-off-by: Julien Danjou <[email protected]>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8c543b..717098d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-23  Julien Danjou  <[email protected]>
+
+	* gnus-art.el (article-make-date-line): Ignore errors if time is
+	invalid and not convertible.
+	(article-make-date-line): Only add lapsed time if time is not nil.
+
 2011-02-23  Teodor Zlatanov  <[email protected]>
 
 	* auth-source.el (auth-source-netrc-create): Use `read-char' instead of
diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2a36c43..5b3489a 100644
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3463,7 +3463,7 @@ possible values."
 			     combined-lapsed))
     (error "Unknown conversion type: %s" type))
   (condition-case ()
-      (let ((time (date-to-time date)))
+      (let ((time (ignore-errors (date-to-time date))))
 	(cond
 	 ;; Convert to the local timezone.
 	 ((eq type 'local)
@@ -3515,6 +3515,7 @@ possible values."
 		(segments 3)
 		lapsed-string)
 	    (while (and
+                    time
 		    (setq lapsed-string
 			  (concat " (" (article-lapsed-string time segments) ")"))
 		    (> (+ (length date-string)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog   |    6 ++++++
 lisp/gnus-art.el |    3 ++-
 2 files changed, 8 insertions(+), 1 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project