[gnus git] branch master updated: =1= 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)

       via  d1751f24f747443631b94c00d30036668958b0e1 (commit)
      from  0dc9bf52cf0ec7b3ee90d4de869ee3614f515f7c (commit)


- Log -----------------------------------------------------------------
commit d1751f24f747443631b94c00d30036668958b0e1
Author: Glenn Morris <[email protected]>
Date:   Mon Jan 3 08:05:39 2011 +0000

    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/ChangeLog b/lisp/ChangeLog
index aff0071..23999ec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,21 @@
+2011-01-03  Glenn Morris  <[email protected]>
+
+	* 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)
+
 2011-01-02  Karl Fogel  <[email protected]>
 
 	* gnus-msg.el (gnus-message-replyencrypt): Default to `t'.
 
+2011-01-03  Glenn Morris  <[email protected]>
+
+	* 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)
+
 2011-01-02  Lars Magne Ingebrigtsen  <[email protected]>
 
 	* nnimap.el (nnimap-login): Prefer AUTH=CRAM-MD5, if it's available.
diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index a364706..939fc6c 100644
--- a/lisp/sieve-manage.el
+++ b/lisp/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
diff --git a/lisp/sieve.el b/lisp/sieve.el
index ca181c2..f37a3b6 100644
--- a/lisp/sieve.el
+++ b/lisp/sieve.el
@@ -322,9 +322,10 @@ Server  : " server ":" (or port "2000") "
 (defun sieve-open-server (server &optional port)
   "Open SERVER (on PORT) and authenticate."
   (with-current-buffer
-      ;; open server
+      (or ;; open server
       (set (make-local-variable 'sieve-manage-buffer)
            (sieve-manage-open server))
+       (error "Error opening server %s" server))
     (sieve-manage-authenticate)))
 
 (defun sieve-refresh-scriptlist ()

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog       |   14 ++++++++++++++
 lisp/sieve-manage.el |    5 +++--
 lisp/sieve.el        |    7 ++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project