Mercurial > emacs
changeset 112104:147ba7e5851b
* lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sun, 02 Jan 2011 17:44:30 -0800 |
| parents | dc86a96ec68e |
| children | d0bb1b112e73 |
| files | lisp/gnus/ChangeLog lisp/gnus/sieve-manage.el |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Sun Jan 02 17:41:54 2011 -0800 +++ b/lisp/gnus/ChangeLog Sun Jan 02 17:44:30 2011 -0800 @@ -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)
--- a/lisp/gnus/sieve-manage.el Sun Jan 02 17:41:54 2011 -0800 +++ b/lisp/gnus/sieve-manage.el Sun Jan 02 17:44:30 2011 -0800 @@ -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