(starttls-any-program-available): Rewritten so it doesn't require

itself and to remove `with-no-warnings'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5acaa2d..f9e2137 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-04  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * starttls.el (starttls-any-program-available): Rewritten so it doesn't
+       require itself and to remove `with-no-warnings'.
+
 2008-11-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * starttls.el (starttls-any-program-available): Get the name of the

diff --git a/lisp/starttls.el b/lisp/starttls.el
index d47daff..03d8522 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -301,12 +301,11 @@ GNUTLS requires a port number."
                     starttls-gnutls-program
                   starttls-program)))
     (condition-case ()
-       (with-no-warnings
-         (require 'starttls)
+       (progn
          (call-process program)
          program)
       (error (progn
-              (message "No STARTTLS program was available (tried '%s')" 
+              (message "No STARTTLS program was available (tried '%s')"
                        program)
               nil)))))