From acaf905b1130aae80fa59d2c861ffd4c8eb75486 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 5 Jan 2012 01:46:05 -0800 Subject: Add 2012 to FSF copyright years for Emacs files --- lisp/gnus/starttls.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lisp/gnus/starttls.el') diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index af9fd42c12..30a1f172f6 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -1,6 +1,6 @@ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999-2011 Free Software Foundation, Inc. +;; Copyright (C) 1999-2012 Free Software Foundation, Inc. ;; Author: Daiki Ueno ;; Author: Simon Josefsson -- cgit v1.2.3 From 8f30779d5c435d6c2906dae7b0c2991a52b7db60 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Thu, 5 Jan 2012 11:14:10 +0000 Subject: starttls.el (starttls-available-p): Return nil on Windows/MS-DOS systems, since these allegedly don't work there. --- lisp/gnus/ChangeLog | 5 +++++ lisp/gnus/starttls.el | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'lisp/gnus/starttls.el') diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 89a16769e2..446cc4f272 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2012-01-05 Lars Magne Ingebrigtsen + + * starttls.el (starttls-available-p): Return nil on Windows/MS-DOS + systems, since these allegedly don't work there. + 2012-01-04 Chris Gray (tiny change) * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el index 30a1f172f6..2d40365053 100644 --- a/lisp/gnus/starttls.el +++ b/lisp/gnus/starttls.el @@ -297,9 +297,10 @@ GnuTLS requires a port number." (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 -- cgit v1.2.3