[Emacs-diffs] /srv/bzr/emacs/trunk r106785: starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, since these allegedly don't work there.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106785
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2012-01-05 11:14:10 +0000
message:
  starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, 
since these allegedly don't work there.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/starttls.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-01-05 09:46:05 +0000
+++ b/lisp/gnus/ChangeLog       2012-01-05 11:14:10 +0000
@@ -1,3 +1,8 @@
+2012-01-05  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * starttls.el (starttls-available-p): Return nil on Windows/MS-DOS
+       systems, since these allegedly don't work there.
+
 2012-01-04  Chris Gray  <address@hidden>  (tiny change)
 
        * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a

=== modified file 'lisp/gnus/starttls.el'
--- a/lisp/gnus/starttls.el     2012-01-05 09:46:05 +0000
+++ b/lisp/gnus/starttls.el     2012-01-05 11:14:10 +0000
@@ -297,9 +297,10 @@
 
 (defun starttls-available-p ()
   "Say whether the STARTTLS programs are available."
-  (executable-find (if starttls-use-gnutls
-                      starttls-gnutls-program
-                    starttls-program)))
+  (and (not (memq system-type '(windows-nt ms-dos)))
+       (executable-find (if starttls-use-gnutls
+                           starttls-gnutls-program
+                         starttls-program))))
 
 (defalias 'starttls-any-program-available 'starttls-available-p)
 (make-obsolete 'starttls-any-program-available 'starttls-available-p