X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fstarttls.el;h=02a557de5ccd24d1e631a70ea3e964d7acecb08b;hb=256fdbaa9d56b75154364c2faf6a94441ea4993e;hp=d47daff27150ffe045d4dd2b2bf35eff507192b1;hpb=26165a16e429c59cb2e4c9d467b9f01d18ca35e2;p=gnus

diff --git a/lisp/starttls.el b/lisp/starttls.el
index d47daff27..02a557de5 100644
--- 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,16 +301,14 @@ 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)))))
 
 (provide 'starttls)
 
-;; arch-tag: 648b3bd8-63bd-47f5-904c-7c819aea2297
 ;;; starttls.el ends here