diff options
| author | Sébastien Delafond <sdelafond@gmail.com> | 2016-11-07 10:41:54 +0100 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2016-11-07 10:41:54 +0100 |
| commit | 1a7cd65ca362047cd97d4127d49108994baebc6c (patch) | |
| tree | f18735f3b77120ef2e91043f2f662b03e47ccbb0 /contrib/lisp/org-vm.el | |
| parent | 55074078ca876273e3fa58ee6838cba90d2b6100 (diff) | |
| parent | ec84430cf4e09ba25ec675debdf802bc28111e06 (diff) | |
Merge tag 'upstream/9.0'
Upstream version 9.0
Diffstat (limited to 'contrib/lisp/org-vm.el')
| -rw-r--r-- | contrib/lisp/org-vm.el | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/contrib/lisp/org-vm.el b/contrib/lisp/org-vm.el index 18d1be6..070d2f8 100644 --- a/contrib/lisp/org-vm.el +++ b/contrib/lisp/org-vm.el @@ -55,9 +55,8 @@ (defvar vm-folder-directory) ;; Install the link type -(org-add-link-type "vm" 'org-vm-open) -(org-add-link-type "vm-imap" 'org-vm-imap-open) -(add-hook 'org-store-link-functions 'org-vm-store-link) +(org-link-set-parameters "vm" :follow #'org-vm-open :store #'org-vm-store-link) +(org-link-set-parameters "vm-imap" :follow #'org-vm-imap-open) ;; Implementation (defun org-vm-store-link () @@ -77,12 +76,6 @@ (message-id (vm-su-message-id message)) (link-type (if (vm-imap-folder-p) "vm-imap" "vm")) (date (vm-get-header-contents message "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)))) folder desc link) (if (vm-imap-folder-p) (let ((spec (vm-imap-find-spec-for-buffer (current-buffer)))) @@ -93,12 +86,9 @@ (string-match (concat "^" (regexp-quote vm-folder-directory)) folder)) (setq folder (replace-match "" t t folder))))) - (setq message-id (org-remove-angle-brackets message-id)) + (setq message-id (org-unbracket-string "<" ">" message-id)) (org-store-link-props :type link-type :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)) + :message-id message-id :date date) (setq desc (org-email-link-description)) (setq link (concat (concat link-type ":") folder "#" message-id)) (org-add-link-props :link link :description desc) @@ -126,12 +116,10 @@ (cond ((featurep 'tramp) ;; use tramp to access the file - (if (featurep 'xemacs) - (setq folder (format "[%s@%s]%s" user host file)) - (setq folder (format "/%s@%s:%s" user host file)))) + (setq folder (format "/%s@%s:%s" user host file))) (t ;; use ange-ftp or efs - (require (if (featurep 'xemacs) 'efs 'ange-ftp)) + (require 'ange-ftp) (setq folder (format "/%s@%s:%s" user host file)))))) (when folder (funcall (cdr (assq 'vm org-link-frame-setup)) folder readonly) |