Merge from emacs-23

[bpt/emacs.git] / lisp / org / org-rmail.el

diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index 101b002..c3b7d45 100644 (file)
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -1,12 +1,12 @@
 ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.29c
+;; Version: 7.4
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -59,10 +59,20 @@
               (from (mail-fetch-field "from"))
               (to (mail-fetch-field "to"))
               (subject (mail-fetch-field "subject"))
+              (date (mail-fetch-field "date"))
+              (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))))
               desc link)
          (org-store-link-props
           :type "rmail" :from from :to to
           :subject subject :message-id message-id)
+         (when date
+           (org-add-link-props :date date :date-timestamp date-ts
+                               :date-timestamp-inactive date-ts-ia))
          (setq message-id (org-remove-angle-brackets message-id))
          (setq desc (org-email-link-description))
          (setq link (org-make-link "rmail:" folder "#" message-id))