Merge from emacs-23

[gnu-emacs] / lisp / gnus / sieve.el

diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index 6f235eecf6bd324d1de43e32479b290847677025..825bdd65ec93d8f713a01e91a82c905eeab88a8a 100644 (file)
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -320,11 +320,13 @@ Server  : " server ":" (or port "2000") "
       (insert "\n"))))
 
 (defun sieve-open-server (server &optional port)
-  ;; open server
-  (set (make-local-variable 'sieve-manage-buffer)
-       (sieve-manage-open server))
-  ;; authenticate
-  (sieve-manage-authenticate nil nil sieve-manage-buffer))
+  "Open SERVER (on PORT) and authenticate."
+  (with-current-buffer
+      (or ;; open server
+       (set (make-local-variable 'sieve-manage-buffer)
+           (sieve-manage-open server))
+       (error "Error opening server %s" server))
+    (sieve-manage-authenticate)))
 
 (defun sieve-refresh-scriptlist ()
   (interactive)
@@ -380,5 +382,4 @@ Server  : " server ":" (or port "2000") "
 
 (provide 'sieve)
 
-;; arch-tag: 7f6a6d94-94e1-4654-ab9a-aee21b9b8a94
 ;; sieve.el ends here