From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 7 May 2011 17:58:40 +0000 (+0300)
Subject: Fix bug #8595 with setting mailclient-send-it on MS-Windows.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~69
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=605c9376615199941166d9441add6b55be23f2ce;p=emacs.git

Fix bug #8595 with setting mailclient-send-it on MS-Windows.

 lisp/mail/sendmail.el (send-mail-function): On MS-Windows, default to
 mailclient-send-it even if window-system is nil.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d54350128f..449c67b0cfb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-07  Eli Zaretskii  <eliz@gnu.org>
 
+	* mail/sendmail.el (send-mail-function): On MS-Windows, default to
+	mailclient-send-it even if window-system is nil.  (Bug#8595)
+
 	* term/w32console.el (terminal-init-w32console): Call
 	get-screen-color and use its output to set the frame
 	background-mode.  (Bug#8597)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 3b5ba2e029e..069ad9662a2 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -141,14 +141,18 @@ Otherwise, let mailer send back a message to report errors."
 ;; standard value.
 ;;;###autoload
 (put 'send-mail-function 'standard-value
-     '((if (and window-system (memq system-type '(darwin windows-nt)))
+     ;; MS-Windows can access the clipboard even under -nw.
+     '((if (or (and window-system (eq system-type 'darwin))
+	       (eq system-type 'windows-nt))
 	   'mailclient-send-it
 	 'sendmail-send-it)))
 
 ;; Useful to set in site-init.el
 ;;;###autoload
 (defcustom send-mail-function
-  (if (and window-system (memq system-type '(darwin windows-nt)))
+  (if (or (and window-system (eq system-type 'darwin))
+	  ;; MS-Windows can access the clipboard even under -nw.
+	  (eq system-type 'windows-nt))
       'mailclient-send-it
     'sendmail-send-it)
   "Function to call to send the current buffer as mail.