diff options
| author | Glenn Morris <rgm@gnu.org> | 2011-01-02 17:44:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2011-01-02 17:44:30 -0800 |
| commit | c4c15f02b7063626d9bf482c442bcb14904bac6c (patch) | |
| tree | 17228c8fbc87fef46646c1508ea3ad2a31f468b4 /lisp/gnus | |
| parent | 980f570a78ae67460930f06de5be34ea65520c8f (diff) | |
| download | emacs-c4c15f02b7063626d9bf482c442bcb14904bac6c.tar.gz | |
* lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/gnus/sieve-manage.el | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 75aebf79873..0dad22d89cc 100644 --- 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 a3647061d15..939fc6ca3fb 100644 --- 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 |