Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
	lisp/ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf4a077..3f8b71c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-11  Michael Welsh Duggan  <md5i@md5i.com>  (tiny change)
+
+       * sieve-manage.el (sieve-manage-open): Allow port names as well as port
+       numbers.
+
 2010-10-11  Julien Danjou  <julien@danjou.info>
 
        * shr.el (shr-hr-line): Add.

diff --git a/lisp/sieve-manage.el b/lisp/sieve-manage.el
index c542632..3d04a5a 100644 (file)
--- a/lisp/sieve-manage.el
+++ b/lisp/sieve-manage.el
@@ -150,7 +150,7 @@ for doing the actual authentication."
   :group 'sieve-manage)
 
 (defcustom sieve-manage-default-port 2000
-  "Default port number for managesieve protocol."
+  "Default port number or service name for managesieve protocol."
   :type 'integer
   :group 'sieve-manage)
 
@@ -389,7 +389,7 @@ 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:%d" server (or port sieve-manage-default-port))))
+  (setq buffer (or buffer (format " *sieve* %s:%s" server (or port sieve-manage-default-port))))
   (with-current-buffer (get-buffer-create buffer)
     (mapc 'make-local-variable sieve-manage-local-variables)
     (sieve-manage-disable-multibyte)