mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-22 13:10:42 +00:00
Merge branch 'master' of orgmode.org:org-mode
This commit is contained in:
commit
a379f9c6ad
|
@ -152,11 +152,16 @@ If `org-store-link' was called with a prefix arg the meaning of
|
||||||
(from (mail-header-from header))
|
(from (mail-header-from header))
|
||||||
(message-id (org-remove-angle-brackets (mail-header-id header)))
|
(message-id (org-remove-angle-brackets (mail-header-id header)))
|
||||||
(date (org-trim (mail-header-date header)))
|
(date (org-trim (mail-header-date header)))
|
||||||
(date-ts (and date (format-time-string
|
(date-ts (and date
|
||||||
(org-time-stamp-format t) (date-to-time date))))
|
(condition-case nil
|
||||||
(date-ts-ia (and date (format-time-string
|
(format-time-string
|
||||||
(org-time-stamp-format t t)
|
(org-time-stamp-format t)
|
||||||
(date-to-time date))))
|
(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)))
|
(subject (copy-sequence (mail-header-subject header)))
|
||||||
(to (cdr (assq 'To (mail-header-extra header))))
|
(to (cdr (assq 'To (mail-header-extra header))))
|
||||||
newsgroups x-no-archive desc link)
|
newsgroups x-no-archive desc link)
|
||||||
|
|
Loading…
Reference in a new issue