aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-01-02 17:41:54 -0800
committerGlenn Morris2011-01-02 17:41:54 -0800
commit980f570a78ae67460930f06de5be34ea65520c8f (patch)
tree22d536a54a7fec5d83cf7ae1ead7d589215b4aab
parentd368a3408f480f10de6aba919b85ff711e3cfca3 (diff)
downloademacs-980f570a78ae67460930f06de5be34ea65520c8f.tar.gz
emacs-980f570a78ae67460930f06de5be34ea65520c8f.zip
Small sieve.el fix for bug #7720.
* lisp/gnus/sieve.el (sieve-open-server): Give a more explicit error if sieve-manage-open returns nil.
-rw-r--r--lisp/gnus/ChangeLog5
-rw-r--r--lisp/gnus/sieve.el7
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 00702e73596..75aebf79873 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12011-01-03 Glenn Morris <rgm@gnu.org>
2
3 * sieve.el (sieve-open-server): Give a more explicit error if
4 sieve-manage-open returns nil. (Bug#7720)
5
12011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org> 62011-01-02 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 7
3 * nnimap.el (nnimap-login): Prefer AUTH=CRAM-MD5, if it's available. 8 * nnimap.el (nnimap-login): Prefer AUTH=CRAM-MD5, if it's available.
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index ca181c2e7b3..f37a3b6ad7d 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -322,9 +322,10 @@ Server : " server ":" (or port "2000") "
322(defun sieve-open-server (server &optional port) 322(defun sieve-open-server (server &optional port)
323 "Open SERVER (on PORT) and authenticate." 323 "Open SERVER (on PORT) and authenticate."
324 (with-current-buffer 324 (with-current-buffer
325 ;; open server 325 (or ;; open server
326 (set (make-local-variable 'sieve-manage-buffer) 326 (set (make-local-variable 'sieve-manage-buffer)
327 (sieve-manage-open server)) 327 (sieve-manage-open server))
328 (error "Error opening server %s" server))
328 (sieve-manage-authenticate))) 329 (sieve-manage-authenticate)))
329 330
330(defun sieve-refresh-scriptlist () 331(defun sieve-refresh-scriptlist ()