[Emacs-diffs] /srv/bzr/emacs/trunk r102742: * lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.

[Glenn Morris]

------------------------------------------------------------
revno: 102742
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-02 17:44:30 -0800
message:
  * lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set 
sieve-manage-port.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/sieve-manage.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-01-03 01:41:54 +0000
+++ b/lisp/gnus/ChangeLog       2011-01-03 01:44:30 +0000
@@ -1,5 +1,7 @@
 2011-01-03  Glenn Morris  <address@hidden>
 
+       * 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)
 

=== modified file 'lisp/gnus/sieve-manage.el'
--- a/lisp/gnus/sieve-manage.el 2010-11-01 01:38:04 +0000
+++ b/lisp/gnus/sieve-manage.el 2011-01-03 01:44:30 +0000
@@ -390,13 +390,14 @@
 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