X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7ad8fe5e2876518a8f33b80050f98dab4ff78398..45261b503cea5ddf9dc2cbdf294c68b053875eb4:/lisp/mail/mailclient.el

diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 68c7afc6ae..b957d9f36c 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,6 +1,6 @@
-;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
+;;; mailclient.el --- mail sending via system's mail client.
 
-;; Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation
+;; Copyright (C) 2005-2011 Free Software Foundation
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
@@ -46,6 +46,7 @@
 
 (require 'sendmail)   ;; for mail-sendmail-undelimit-header
 (require 'mail-utils) ;; for mail-fetch-field
+(require 'browse-url)
 
 (defcustom mailclient-place-body-on-clipboard-flag
   (fboundp 'w32-set-clipboard-data)
@@ -98,6 +99,8 @@ supported.  Defaults to non-nil on Windows, nil otherwise."
 	      (mail-strip-quoted-names field) "\, *"))
 	    result)))))
 
+(declare-function clipboard-kill-ring-save "menu-bar.el" (beg end))
+
 ;;;###autoload
 (defun mailclient-send-it ()
   "Pass current buffer on to the system's mail client.
@@ -120,7 +123,10 @@ The mail client is taken to be the handler of mailto URLs."
 	  (while (and (re-search-forward "\n\n\n*" delimline t)
 		      (< (point) delimline))
 	    (replace-match "\n"))
-	  (let ((case-fold-search t))
+	  (let ((case-fold-search t)
+		;; Use the external browser function to send the
+		;; message.
+		(browse-url-mailto-function nil))
 	    ;; initialize limiter
 	    (setq mailclient-delim-static "?")
 	    ;; construct and call up mailto URL
@@ -162,11 +168,10 @@ The mail client is taken to be the handler of mailto URLs."
 		       (+ 1 delimline) (point-max))
 		      (concat
 		       "*** E-Mail body has been placed on clipboard, "
-		       "please paste them here! ***"))
+		       "please paste it here! ***"))
 		  ;; else
 		  (buffer-substring (+ 1 delimline) (point-max))))))))))))
 
 (provide 'mailclient)
 
-;; arch-tag: 35d10fc8-a1bc-4f29-a4e6-c288e53578ef
 ;;; mailclient.el ends here