[Emacs-diffs] /srv/bzr/emacs/trunk r104157: Fix bug #8595 with setting mailclient-send-it on MS-Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 104157
fixes bug(s): http://debbugs.gnu.org/8595
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2011-05-07 20:58:40 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/mail/sendmail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-05-07 17:39:44 +0000
+++ b/lisp/ChangeLog    2011-05-07 17:58:40 +0000
@@ -1,5 +1,8 @@
 2011-05-07  Eli Zaretskii  <address@hidden>
 
+       * 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)

=== modified file 'lisp/mail/sendmail.el'
--- a/lisp/mail/sendmail.el     2011-04-15 13:50:04 +0000
+++ b/lisp/mail/sendmail.el     2011-05-07 17:58:40 +0000
@@ -141,14 +141,18 @@
 ;; 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.