aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2010-11-24 07:34:12 +0100
committerLars Magne Ingebrigtsen2010-11-24 07:34:12 +0100
commit7bd9b9d8b4e201ee169801c0ced5e0c5e172a9e2 (patch)
tree7c221a449cecb350b5e265c3456c7ba356347d97
parent876d1684cf36bc9c38b45fa5e6c700944233c56b (diff)
downloademacs-7bd9b9d8b4e201ee169801c0ced5e0c5e172a9e2.tar.gz
emacs-7bd9b9d8b4e201ee169801c0ced5e0c5e172a9e2.zip
(mailclient-send-it): Bind `browse-url-mailto-function' to nil to
use the external browser function to send the mail.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/mail/mailclient.el6
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6936c2ad17d..eb5d49387f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12010-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 12010-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * mail/mailclient.el (browse-url): Require.
4 (mailclient-send-it): Bind `browse-url-mailto-function' to nil to
5 use the external browser function to send the mail (bug#7469).
6
3 * net/browse-url.el (browse-url-browser-function): Revert the 7 * net/browse-url.el (browse-url-browser-function): Revert the
4 default back to the previous value, since the new value broke 8 default back to the previous value, since the new value broke
5 mailclient.el. 9 mailclient.el.
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index dd5ec2dd388..2a5d77d4f74 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -46,6 +46,7 @@
46 46
47(require 'sendmail) ;; for mail-sendmail-undelimit-header 47(require 'sendmail) ;; for mail-sendmail-undelimit-header
48(require 'mail-utils) ;; for mail-fetch-field 48(require 'mail-utils) ;; for mail-fetch-field
49(require 'browse-url)
49 50
50(defcustom mailclient-place-body-on-clipboard-flag 51(defcustom mailclient-place-body-on-clipboard-flag
51 (fboundp 'w32-set-clipboard-data) 52 (fboundp 'w32-set-clipboard-data)
@@ -122,7 +123,10 @@ The mail client is taken to be the handler of mailto URLs."
122 (while (and (re-search-forward "\n\n\n*" delimline t) 123 (while (and (re-search-forward "\n\n\n*" delimline t)
123 (< (point) delimline)) 124 (< (point) delimline))
124 (replace-match "\n")) 125 (replace-match "\n"))
125 (let ((case-fold-search t)) 126 (let ((case-fold-search t)
127 ;; Use the external browser function to send the
128 ;; message.
129 (browse-url-mailto-function nil))
126 ;; initialize limiter 130 ;; initialize limiter
127 (setq mailclient-delim-static "?") 131 (setq mailclient-delim-static "?")
128 ;; construct and call up mailto URL 132 ;; construct and call up mailto URL