(nnimap-verify-uidvalidity): Fixed bug where uidvalidity

[gnus] / lisp / starttls.el

diff --git a/lisp/starttls.el b/lisp/starttls.el
index d47daff..18c05bf 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -1,7 +1,7 @@
 ;;; starttls.el --- STARTTLS functions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
@@ -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)))))