Explorar el Código

org-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched

* org-rmail.el (org-rmail-follow-link): Don't raise an error
when no article is matched.
Bastien Guerry hace 11 años
padre
commit
e764dfe80b
Se han modificado 1 ficheros con 5 adiciones y 3 borrados
  1. 5 3
      lisp/org-rmail.el

+ 5 - 3
lisp/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