Merge from emacs-23

[gnu-emacs] / lisp / mail / rfc2368.el

diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index 151e6f68037c89d945c4b78fd20b528d879eb51a..255e73ea2f2902dea10bf9c0dacb3fe82dd44ab7 100644 (file)
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -92,13 +92,11 @@ Note: make sure MAILTO-URL has been 'unhtmlized' (e.g. & -> &), before
 calling this function."
   (let ((case-fold-search t)
        prequery query headers-alist)
-
+    (setq mailto-url (replace-regexp-in-string "\n" " " mailto-url))
     (if (string-match rfc2368-mailto-regexp mailto-url)
        (progn
-
          (setq prequery
                (match-string rfc2368-mailto-prequery-index mailto-url))
-
          (setq query
                (match-string rfc2368-mailto-query-index mailto-url))
 
@@ -131,10 +129,8 @@ calling this function."
 
          headers-alist)
 
-      (error "Failed to match a mailto: url"))
-    ))
+      (error "Failed to match a mailto: url"))))
 
 (provide 'rfc2368)
 
-;; arch-tag: ea804934-ad96-4f69-957b-857a76e4fd95
 ;;; rfc2368.el ends here