(shr-tag-li): Get <li> indentation right.

[gnus] / lisp / starttls.el

diff --git a/lisp/starttls.el b/lisp/starttls.el
index d47daff..a4d33b8 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>
@@ -254,8 +254,7 @@ handshake, or nil on failure."
     (starttls-set-process-query-on-exit-flag process nil)
     (while (and (processp process)
                (eq (process-status process) 'run)
-               (save-excursion
-                 (set-buffer buffer)
+               (with-current-buffer buffer
                  (goto-char old-max)
                  (not (setq done (re-search-forward
                                   starttls-connect nil t)))))
@@ -270,6 +269,7 @@ handshake, or nil on failure."
             host port (if done "done" "failed"))
     process))
 
+;;;###autoload
 (defun starttls-open-stream (name buffer host port)
   "Open a TLS connection for a port to a host.
 Returns a subprocess object to represent the connection.
@@ -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