[Emacs-diffs] /srv/bzr/emacs/trunk r107657: Fix starttls-related error message under Windows

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 107657
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2012-03-22 19:42:12 +0100
message:
  Fix starttls-related error message under Windows
  
  * net/network-stream.el (network-stream-open-starttls): Make error
  message under Windows be less misleading.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-22 14:46:05 +0000
+++ b/lisp/ChangeLog    2012-03-22 18:42:12 +0000
@@ -1,3 +1,8 @@
+2012-03-22  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * net/network-stream.el (network-stream-open-starttls): Make error
+       message under Windows be less misleading.
+
 2012-03-22  Liang Wang  <address@hidden>  (tiny change)
 
        * progmodes/etags.el (etags-list-tags): Only use tags which goto-func

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2012-01-10 10:24:42 +0000
+++ b/lisp/net/network-stream.el        2012-03-22 18:42:12 +0000
@@ -302,11 +302,16 @@
            (if (or (null starttls-command)
                    starttls-available)
                "Server does not support TLS"
-             (concat "Emacs does not support TLS, and no external `"
-                     (if starttls-use-gnutls
-                         starttls-gnutls-program
-                       starttls-program)
-                     "' program was found")))
+             ;; See `starttls-available-p'.  If this predicate
+             ;; changes to allow running under Windows, the error
+             ;; message below should be amended.
+             (if (memq system-type '(windows-nt ms-dos))
+                 (concat "Emacs does not support TLS")
+               (concat "Emacs does not support TLS, and no external `"
+                       (if starttls-use-gnutls
+                           starttls-gnutls-program
+                         starttls-program)
+                       "' program was found"))))
       (delete-process stream)
       (setq stream nil))
     ;; Return value: