summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-01-13 13:06:57 +0100
committerBastien Guerry <bzg@altern.org>2011-01-13 13:06:57 +0100
commita379f9c6ad32d6cfc1907493b11687ee6aee6919 (patch)
treeb10042f96500e9b9142affeef0b9a312fe3eaed5
parent4c2ad5f87cfea5a722d60b737b858e1559c7697d (diff)
parent0ec831d2c898a1cf65787efaf212330a1ccf2b17 (diff)
downloadorg-mode-a379f9c6ad32d6cfc1907493b11687ee6aee6919.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-gnus.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/org-gnus.el b/lisp/org-gnus.el
index 32641bf..ae5dc52 100644
--- a/lisp/org-gnus.el
+++ b/lisp/org-gnus.el
@@ -152,11 +152,16 @@ If `org-store-link' was called with a prefix arg the meaning of
(from (mail-header-from header))
(message-id (org-remove-angle-brackets (mail-header-id header)))
(date (org-trim (mail-header-date header)))
- (date-ts (and date (format-time-string
- (org-time-stamp-format t) (date-to-time date))))
- (date-ts-ia (and date (format-time-string
- (org-time-stamp-format t t)
- (date-to-time date))))
+ (date-ts (and date
+ (condition-case nil
+ (format-time-string
+ (org-time-stamp-format t)
+ (date-to-time date)))))
+ (date-ts-ia (and date
+ (condition-case nil
+ (format-time-string
+ (org-time-stamp-format t t)
+ (date-to-time date)))))
(subject (copy-sequence (mail-header-subject header)))
(to (cdr (assq 'To (mail-header-extra header))))
newsgroups x-no-archive desc link)