summaryrefslogtreecommitdiff
path: root/lisp/org/org-rmail.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/org-rmail.el')
-rw-r--r--lisp/org/org-rmail.el8
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/org/org-rmail.el b/lisp/org/org-rmail.el
index ccfa59f5cf5..6859b659dde 100644
--- a/lisp/org/org-rmail.el
+++ b/lisp/org/org-rmail.el
@@ -95,7 +95,10 @@
(defun org-rmail-follow-link (folder article)
"Follow an Rmail link to FOLDER and ARTICLE."
(require 'rmail)
- (setq article (org-add-angle-brackets article))
+ (cond ((null article) (setq article ""))
+ ((stringp article)
+ (setq article (org-add-angle-brackets article)))
+ (t (user-error "Wrong RMAIL link format")))
(let (message-number)
(save-excursion
(save-window-excursion
@@ -105,8 +108,7 @@
(rmail-widen)
(goto-char (point-max))
(if (re-search-backward
- (concat "^Message-ID:\\s-+" (regexp-quote
- (or article "")))
+ (concat "^Message-ID:\\s-+" (regexp-quote article))
nil t)
(rmail-what-message))))))
(if message-number