Merge changes from emacs-23 branch

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

diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index eb6911880e0e33451c0707bab6ab8697cfaf636d..2a5d77d4f74508250ec78b26e292ee78cda2d654 100644 (file)
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,16 +1,16 @@
 ;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation
+;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -48,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)
@@ -100,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.
@@ -122,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
@@ -164,7 +168,7 @@ 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))))))))))))