* lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 75aebf7987383f5f9bbf23347e04dcb2c61adfad..0dad22d89cc72b866e4e41aef614c9a87cb58561 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
 2011-01-03  Glenn Morris  <rgm@gnu.org>
 
+       * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
+
        * sieve.el (sieve-open-server): Give a more explicit error if
        sieve-manage-open returns nil.  (Bug#7720)
 

diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index a3647061d15906709a9d6111a9cfeae0062f1f03..939fc6ca3fbb7eb1f5a9ca6fe5d307bf1fd1833a 100644 (file)
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -390,13 +390,14 @@ Optional argument AUTH indicates authenticator to use, see
 If nil, chooses the best stream the server is capable of.
 Optional argument BUFFER is buffer (buffer, or string naming buffer)
 to work in."
-  (setq buffer (or buffer (format " *sieve* %s:%s" server (or port sieve-manage-default-port))))
+  (or port (setq port sieve-manage-default-port))
+  (setq buffer (or buffer (format " *sieve* %s:%s" server port)))
   (with-current-buffer (get-buffer-create buffer)
     (mapc 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)
     (buffer-disable-undo)
     (setq sieve-manage-server (or server sieve-manage-server))
-    (setq sieve-manage-port (or port sieve-manage-port))
+    (setq sieve-manage-port port)
     (setq sieve-manage-stream (or stream sieve-manage-stream))
     (message "sieve: Connecting to %s..." sieve-manage-server)
     (if (let ((sieve-manage-stream