aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-07-02 13:17:41 +0000
committerJuanma Barranquero2008-07-02 13:17:41 +0000
commit56fd9faa2f35556996de5777734663de5ad235e3 (patch)
tree1e3feb70cf23747e031e82fbd3e3eaf3209b1947
parent1f8da6df7d15ee9eb08329526158926f459eee79 (diff)
downloademacs-56fd9faa2f35556996de5777734663de5ad235e3.tar.gz
emacs-56fd9faa2f35556996de5777734663de5ad235e3.zip
* nnimap.el (nnimap-id):
* sieve-manage.el (sieve-manage-open): Doc fixes.
-rw-r--r--lisp/gnus/ChangeLog7
-rw-r--r--lisp/gnus/nnimap.el4
-rw-r--r--lisp/gnus/sieve-manage.el12
3 files changed, 14 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 10fb4e2e928..ab38653fd5d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
12008-07-02 Juanma Barranquero <lekktu@gmail.com>
2
3 * nnimap.el (nnimap-id):
4 * sieve-manage.el (sieve-manage-open): Doc fixes.
5
12008-07-02 Francesc Rocher <rocher@member.fsf.org> 62008-07-02 Francesc Rocher <rocher@member.fsf.org>
2 7
3 * gnus.el (gnus-group-startup-message): Prefer SVG or PNG image, 8 * gnus.el (gnus-group-startup-message): Prefer SVG or PNG image,
@@ -9795,7 +9800,7 @@
97952004-09-01 Simon Josefsson <jas@extundo.com> 98002004-09-01 Simon Josefsson <jas@extundo.com>
9796 9801
9797 * message.el (message-canlock-generate): Require sha1, not 9802 * message.el (message-canlock-generate): Require sha1, not
9798 sha1-el. (Can we get rid of this require alltogheter? It is ugly 9803 sha1-el. (Can we get rid of this require altogether? It is ugly
9799 to require within a function. Sadly, if sha1.el isn't loaded, the 9804 to require within a function. Sadly, if sha1.el isn't loaded, the
9800 let binding in m-c-g will hide the defcustom definition, which is 9805 let binding in m-c-g will hide the defcustom definition, which is
9801 bad.) 9806 bad.)
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 8a9d5c706fe..49166b8de82 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -424,8 +424,8 @@ restrict visible folders.")
424 424
425(defcustom nnimap-id nil 425(defcustom nnimap-id nil
426 "Plist with client identity to send to server upon login. 426 "Plist with client identity to send to server upon login.
427Nil means no information is sent, symbol `no' to disable ID query 427A nil value means no information is sent, symbol `no' to disable ID query
428alltogheter, or plist with identifier-value pairs to send to 428altogether, or plist with identifier-value pairs to send to
429server. RFC 2971 describes the list as follows: 429server. RFC 2971 describes the list as follows:
430 430
431 Any string may be sent as a field, but the following are defined to 431 Any string may be sent as a field, but the following are defined to
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 38fece27a87..513aa9fc05d 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -443,12 +443,12 @@ Returns t if login was successful, nil otherwise."
443 443
444(defun sieve-manage-open (server &optional port stream auth buffer) 444(defun sieve-manage-open (server &optional port stream auth buffer)
445 "Open a network connection to a managesieve SERVER (string). 445 "Open a network connection to a managesieve SERVER (string).
446Optional variable PORT is port number (integer) on remote server. 446Optional argument PORT is port number (integer) on remote server.
447Optional variable STREAM is any of `sieve-manage-streams' (a symbol). 447Optional argument STREAM is any of `sieve-manage-streams' (a symbol).
448Optional variable AUTH indicates authenticator to use, see 448Optional argument AUTH indicates authenticator to use, see
449`sieve-manage-authenticators' for available authenticators. If nil, chooses 449`sieve-manage-authenticators' for available authenticators.
450the best stream the server is capable of. 450If nil, chooses the best stream the server is capable of.
451Optional variable BUFFER is buffer (buffer, or string naming buffer) 451Optional argument BUFFER is buffer (buffer, or string naming buffer)
452to work in." 452to work in."
453 (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000)))) 453 (setq buffer (or buffer (format " *sieve* %s:%d" server (or port 2000))))
454 (with-current-buffer (get-buffer-create buffer) 454 (with-current-buffer (get-buffer-create buffer)