From b90c7b590522023eb37480afb893c2d4545f935c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 15 Aug 2004 03:51:59 +0000 Subject: [PATCH] Synch to No Gnus 200408150330. --- lisp/ChangeLog | 7 +++++++ lisp/rfc2047.el | 8 +++++--- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 11 ++++++++++- texi/gnus.texi | 10 +++++++++- 5 files changed, 36 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b09117f..68126aa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2004-08-15 Katsumi Yamaoka + + * rfc2047.el (rfc2047-encode-region): Assume the close parenthesis + may be included in the encoded word. + (rfc2047-encode): Don't append a space if the encoded word + includes close parenthesis. + 2004-08-12 Katsumi Yamaoka * rfc2047.el (rfc2047-encode-1, rfc2047-encode): Improve encoding diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el index 07818b8..8bf7040 100644 --- a/lisp/rfc2047.el +++ b/lisp/rfc2047.el @@ -369,8 +369,8 @@ Dynamically bind `rfc2047-encoding-type' to change that." (forward-list) ;; Encode text as an unstructured field. (let ((rfc2047-encoding-type 'mime)) - (rfc2047-encode-region (1+ start) (1- (point))) - (forward-char))) + (rfc2047-encode-region (1+ start) (1- (point)))) + (skip-chars-forward ")")) (t ; normal token/whitespace sequence ;; Find the end. ;; Skip one ASCII word, or encode continuous words @@ -607,7 +607,9 @@ Point moves to the end of the region." (insert eword) (set-marker b nil) (set-marker e nil) - (unless (looking-at "[ \t\n)]") + (unless (or (/= 0 (length tail)) + (eobp) + (looking-at "[ \t\n)]")) (insert " ")))) (t (goto-char e))))) diff --git a/texi/ChangeLog b/texi/ChangeLog index 1870658..2755387 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2004-08-15 Simon Josefsson + + * gnus.texi (IMAP): Add example. Suggested and partially written + by Steinar Bang . + 2004-08-12 Katsumi Yamaoka * gnus.texi (Posting Styles): Addition. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 70d2c2c..d120243 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -15541,7 +15541,16 @@ nnimap $B$K5-;v$NFbItE*$JF|IU$NBe$o$j$K(B Date: $B$r;H$&$h$&$K$5$;$^$9!#$5$i$ $B%5!<%P$K%m%0%$%s$9$k$?$a$K;H$&G'>Z>pJs(B (authinfo) $B$r4^$`%U%!%$%k$G$9!#$=(B $B$N7A<0$O(B ($B$[$H$s$I(B) @code{ftp} $B$N(B @file{~/.netrc} $B%U%!%$%k$HF1$8$G$9!#87(B $BL)$JDj5A$O!"JQ?t(B @code{nntp-authinfo-file} $B$r8+$F2<$5$$!#$=$7(B -$B$F(B @ref{NNTP} $B$b8+$F2<$5$$!#(B +$B$F(B @ref{NNTP} $B$b8+$F2<$5$$!#(BIMAP $B%5!<%P!l9g!"$=(B +$B$l$O(B @code{port imap} $B$^$?$O(B @code{port 143} $B$G$J$1$l$P$J$i$J$$$3$H$KCm(B +$B0U$7$F2<$5$$!#(B @item nnimap-need-unselect-to-notice-new-mail @vindex nnimap-need-unselect-to-notice-new-mail diff --git a/texi/gnus.texi b/texi/gnus.texi index b7f9bd7..cf8edb9 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -16368,7 +16368,15 @@ RFC 2060 for more information on valid strings. A file containing credentials used to log in on servers. The format is (almost) the same as the @code{ftp} @file{~/.netrc} file. See the variable @code{nntp-authinfo-file} for exact syntax; also see -@ref{NNTP}. +@ref{NNTP}. An example of an .authinfo line for an IMAP server, is: + +@example +machine students.uio.no login larsi password geheimnis port imap +@end example + +Note that it should be @code{port imap}, or @code{port 143}, if you +use a @code{nnimap-stream} of @code{tls} or @code{ssl}, even if the +actual port number used is port 993 for secured imap. @item nnimap-need-unselect-to-notice-new-mail @vindex nnimap-need-unselect-to-notice-new-mail -- 1.7.10.4