diff options
| author | Glenn Morris | 2011-01-02 17:44:30 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-02 17:44:30 -0800 |
| commit | c4c15f02b7063626d9bf482c442bcb14904bac6c (patch) | |
| tree | 17228c8fbc87fef46646c1508ea3ad2a31f468b4 | |
| parent | 980f570a78ae67460930f06de5be34ea65520c8f (diff) | |
| download | emacs-c4c15f02b7063626d9bf482c442bcb14904bac6c.tar.gz emacs-c4c15f02b7063626d9bf482c442bcb14904bac6c.zip | |
* lisp/gnus/sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port.
| -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 @@ | |||
| 1 | 2011-01-03 Glenn Morris <rgm@gnu.org> | 1 | 2011-01-03 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * sieve-manage.el (sieve-manage-open): Correctly set sieve-manage-port. | ||
| 4 | |||
| 3 | * sieve.el (sieve-open-server): Give a more explicit error if | 5 | * sieve.el (sieve-open-server): Give a more explicit error if |
| 4 | sieve-manage-open returns nil. (Bug#7720) | 6 | sieve-manage-open returns nil. (Bug#7720) |
| 5 | 7 | ||
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 | |||
| 390 | If nil, chooses the best stream the server is capable of. | 390 | If nil, chooses the best stream the server is capable of. |
| 391 | Optional argument BUFFER is buffer (buffer, or string naming buffer) | 391 | Optional argument BUFFER is buffer (buffer, or string naming buffer) |
| 392 | to work in." | 392 | to work in." |
| 393 | (setq buffer (or buffer (format " *sieve* %s:%s" server (or port sieve-manage-default-port)))) | 393 | (or port (setq port sieve-manage-default-port)) |
| 394 | (setq buffer (or buffer (format " *sieve* %s:%s" server port))) | ||
| 394 | (with-current-buffer (get-buffer-create buffer) | 395 | (with-current-buffer (get-buffer-create buffer) |
| 395 | (mapc 'make-local-variable sieve-manage-local-variables) | 396 | (mapc 'make-local-variable sieve-manage-local-variables) |
| 396 | (sieve-manage-disable-multibyte) | 397 | (sieve-manage-disable-multibyte) |
| 397 | (buffer-disable-undo) | 398 | (buffer-disable-undo) |
| 398 | (setq sieve-manage-server (or server sieve-manage-server)) | 399 | (setq sieve-manage-server (or server sieve-manage-server)) |
| 399 | (setq sieve-manage-port (or port sieve-manage-port)) | 400 | (setq sieve-manage-port port) |
| 400 | (setq sieve-manage-stream (or stream sieve-manage-stream)) | 401 | (setq sieve-manage-stream (or stream sieve-manage-stream)) |
| 401 | (message "sieve: Connecting to %s..." sieve-manage-server) | 402 | (message "sieve: Connecting to %s..." sieve-manage-server) |
| 402 | (if (let ((sieve-manage-stream | 403 | (if (let ((sieve-manage-stream |