diff options
| author | Lars Magne Ingebrigtsen | 2010-11-26 03:28:03 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2010-11-26 03:28:03 +0100 |
| commit | b3ea64a3eeb34a0f312dd2e33a2199a39ebe7f46 (patch) | |
| tree | a0e9e6b28bc897402e27de86be7b3ed04b4348a9 | |
| parent | 57cc52bed4948a83d605ff7d50ce52da1d9f5da0 (diff) | |
| download | emacs-b3ea64a3eeb34a0f312dd2e33a2199a39ebe7f46.tar.gz emacs-b3ea64a3eeb34a0f312dd2e33a2199a39ebe7f46.zip | |
* mail/rfc2368.el (rfc2368-parse-mailto-url): Unfold URLs before
parsing them. This makes mailto:...?subject=foo\nbar work.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/rfc2368.el | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bbe0b7c865c..3e322800b8f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-26 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * mail/rfc2368.el (rfc2368-parse-mailto-url): Unfold URLs before | ||
| 4 | parsing them. This makes mailto:...?subject=foo\nbar work. | ||
| 5 | |||
| 1 | 2010-11-25 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2010-11-25 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * vc/diff.el (diff): Fix last change. | 8 | * vc/diff.el (diff): Fix last change. |
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el index f04cf3fc466..0c91fcd8394 100644 --- 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 | |||
| 92 | calling this function." | 92 | calling this function." |
| 93 | (let ((case-fold-search t) | 93 | (let ((case-fold-search t) |
| 94 | prequery query headers-alist) | 94 | prequery query headers-alist) |
| 95 | 95 | (setq mailto-url (replace-regexp-in-string "\n" " " mailto-url)) | |
| 96 | (if (string-match rfc2368-mailto-regexp mailto-url) | 96 | (if (string-match rfc2368-mailto-regexp mailto-url) |
| 97 | (progn | 97 | (progn |
| 98 | |||
| 99 | (setq prequery | 98 | (setq prequery |
| 100 | (match-string rfc2368-mailto-prequery-index mailto-url)) | 99 | (match-string rfc2368-mailto-prequery-index mailto-url)) |
| 101 | |||
| 102 | (setq query | 100 | (setq query |
| 103 | (match-string rfc2368-mailto-query-index mailto-url)) | 101 | (match-string rfc2368-mailto-query-index mailto-url)) |
| 104 | 102 | ||
| @@ -131,10 +129,8 @@ calling this function." | |||
| 131 | 129 | ||
| 132 | headers-alist) | 130 | headers-alist) |
| 133 | 131 | ||
| 134 | (error "Failed to match a mailto: url")) | 132 | (error "Failed to match a mailto: url")))) |
| 135 | )) | ||
| 136 | 133 | ||
| 137 | (provide 'rfc2368) | 134 | (provide 'rfc2368) |
| 138 | 135 | ||
| 139 | ;; arch-tag: ea804934-ad96-4f69-957b-857a76e4fd95 | ||
| 140 | ;;; rfc2368.el ends here | 136 | ;;; rfc2368.el ends here |