From: yamaoka Date: Wed, 20 Jun 2001 03:01:09 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_4-02-quimby-last-~16 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cad0e677f41a9f522339ad8db8f78c1a1fe6262;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0494dd3..f3e777a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,33 @@ +2001-06-19 Simon Josefsson + + * message.el (message-yank-prefix): Doc fix. + (message-yank-cited-prefix): Ditto. + (message-delete-not-region): Keep citation prefix on first line, + if possible and appropriate. + +2001-06-19 Simon Josefsson + + * imap.el (imap-process-connection-type): New variable. + (imap-kerberos4-open, imap-gssapi-open): Use it. This makes + recent `imtest's work completely (no line length issues), while + making making old `imtest's unusable. Thanks to NAGY Andras + for his work. + +2000-12-30 NAGY Andras + + * imap.el (imap-ssl-program): Add -quiet to shut up + OpenSSL/SSLeay's internal debug talk. + +2001-06-19 Matt Armstrong + + * imap.el (imap-parse-flag-list): Workaround bug in Courier IMAP + server. + +2001-06-19 10:00:00 ShengHuo ZHU + + * nnmail.el (nnmail-article-buffer): New variable. + (nnmail-split-incoming): Use it. + 2001-06-15 Eli Zaretskii * qp.el (quoted-printable-decode-region): If called interactively, diff --git a/lisp/imap.el b/lisp/imap.el index 3e4d91e..1cf7a54 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -187,10 +187,10 @@ the list is tried until a successful connection is made." :group 'imap :type '(repeat string)) -(defcustom imap-ssl-program '("openssl s_client -ssl3 -connect %s:%p" - "openssl s_client -ssl2 -connect %s:%p" - "s_client -ssl3 -connect %s:%p" - "s_client -ssl2 -connect %s:%p") +(defcustom imap-ssl-program '("openssl s_client -quiet -ssl3 -connect %s:%p" + "openssl s_client -quiet -ssl2 -connect %s:%p" + "s_client -quiet -ssl3 -connect %s:%p" + "s_client -quiet -ssl2 -connect %s:%p") "A string, or list of strings, containing commands for SSL connections. Within a string, %s is replaced with the server address and %p with port number on server. The program should accept IMAP commands on @@ -213,6 +213,11 @@ until a successful connection is made." :group 'imap :type '(repeat string)) +(defcustom imap-process-connection-type nil + "*Value for `process-connection-type' to use for Kerberos4 and GSSAPI." + :group 'imap + :type 'boolean) + (defvar imap-shell-host "gateway" "Hostname of rlogin proxy.") @@ -438,6 +443,7 @@ If ARGS, PROMPT is used as an argument to `format'." (message "Opening Kerberos 4 IMAP connection with `%s'..." cmd) (erase-buffer) (let* ((port (or port imap-default-port)) + (process-connection-type imap-process-connection-type) (process (as-binary-process (start-process name buffer shell-file-name shell-command-switch @@ -499,6 +505,7 @@ If ARGS, PROMPT is used as an argument to `format'." (while (and (not done) (setq cmd (pop cmds))) (message "Opening GSSAPI IMAP connection with `%s'..." cmd) (let* ((port (or port imap-default-port)) + (process-connection-type imap-process-connection-type) (process (as-binary-process (start-process name buffer shell-file-name shell-command-switch @@ -2229,7 +2236,11 @@ Return nil if no complete line has arrived." (let (flag-list start) (assert (eq (char-after) ?\()) (while (and (not (eq (char-after) ?\))) - (setq start (progn (imap-forward) (point))) + (setq start (progn + (imap-forward) + ;; next line for Courier IMAP bug. + (skip-chars-forward " ") + (point))) (> (skip-chars-forward "^ )" (imap-point-at-eol)) 0)) (push (buffer-substring start (point)) flag-list)) (assert (eq (char-after) ?\))) diff --git a/lisp/message.el b/lisp/message.el index 1f98726..35764ac 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -675,7 +675,8 @@ The function `message-supersede' runs this hook." ;;;###autoload (defcustom message-yank-prefix "> " "*Prefix inserted on the lines of yanked messages. -Fix `message-cite-prefix-regexp' if it is set to an abnormal value." +Fix `message-cite-prefix-regexp' if it is set to an abnormal value. +See also `message-yank-cited-prefix'." :type 'string :group 'message-insertion) @@ -699,7 +700,8 @@ an article is yanked by the command `message-yank-original' interactively." (defcustom message-yank-cited-prefix ">" "*Prefix inserted on cited lines of yanked messages. -Fix `message-cite-prefix-regexp' if it is set to an abnormal value." +Fix `message-cite-prefix-regexp' if it is set to an abnormal value. +See also `message-yank-prefix'." :type 'string :group 'message-insertion) @@ -2212,17 +2214,25 @@ With the prefix argument FORCE, insert the header anyway." (defun message-delete-not-region (beg end) "Delete everything in the body of the current message outside of the region." (interactive "r") - (save-excursion - (goto-char end) - (delete-region (point) (if (not (message-goto-signature)) - (point) - (forward-line -2) - (point))) - (insert "\n") - (goto-char beg) - (delete-region beg (progn (message-goto-body) - (forward-line 2) - (point)))) + (let (citeprefix) + (save-excursion + (goto-char beg) + ;; snarf citation prefix, if appropriate + (unless (eq (point) (progn (beginning-of-line) (point))) + (when (looking-at message-cite-prefix-regexp) + (setq citeprefix (match-string 0)))) + (goto-char end) + (delete-region (point) (if (not (message-goto-signature)) + (point) + (forward-line -2) + (point))) + (insert "\n") + (goto-char beg) + (delete-region beg (progn (message-goto-body) + (forward-line 2) + (point))) + (when citeprefix + (insert citeprefix)))) (when (message-goto-signature) (forward-line -2))) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 8a9cb7c..b9b6757 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -432,6 +432,9 @@ parameter. It should return nil, `warn' or `delete'." ;;; Internal variables. +(defvar nnmail-article-buffer " *nnmail incoming*" + "The buffer used for splitting incoming mails.") + (defvar nnmail-split-history nil "List of group/article elements that say where the previous split put messages.") @@ -897,7 +900,7 @@ FUNC will be called with the buffer narrowed to each mail." nnmail-split-methods))) (save-excursion ;; Insert the incoming file. - (set-buffer (get-buffer-create " *nnmail incoming*")) + (set-buffer (get-buffer-create nnmail-article-buffer)) (erase-buffer) (let ((nnheader-file-coding-system nnmail-incoming-coding-system)) (nnheader-insert-file-contents incoming)) diff --git a/texi/ChangeLog b/texi/ChangeLog index 075ab87..112fe9d 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,9 @@ +2001-06-19 Simon Josefsson + + * gnus.texi (IMAP): Fix `imtest' discussion. + + * gnus-faq.texi (Frequently Asked Questions): Fix URL. + 2001-06-17 Kai Gro,A_(Bjohann * gnus.texi (Group Line Specification): Explain why %t is only an diff --git a/texi/gnus-faq.texi b/texi/gnus-faq.texi index 56c46fb..72f829a 100644 --- a/texi/gnus-faq.texi +++ b/texi/gnus-faq.texi @@ -8,7 +8,7 @@ This is the Gnus Frequently Asked Questions list. If you have a Web browser, the official hypertext version is at -@file{http://www.ccs.neu.edu/software/gnus/}, and has +@file{http://www.ccs.neu.edu/software/contrib/gnus/}, and has probably been updated since you got this manual. @menu diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index dbd27ef..d57e440 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -13819,10 +13819,16 @@ gnus-secondary-select-methods $B$K(B nnimap $B$rEPO?$7$F2<$5$$!#$3$l$K$h$C(B @end itemize @vindex imap-kerberos4-program -@samp{imtest} $B%W%m%0%i%`$O(B Cyrus IMAPD $B$K4^$^$l$F$$$^$9!#(B -nnimap $B$O(B @samp{imtest} $B%P!<%8%g%s(B 1.5.x $B$H(B 1.6.x $B$NN>J}$r%5%]!<%H$7$^$9!#(B -$BJQ?t(B @code{imap-kerberos4-program} $B$O(B imtest $B%W%m%0%i%`$KEO$9%Q%?%a!<%?(B -$B$r4^$_$^$9!#(B +@samp{imtest} $B%W%m%0%i%`$O(B Cyrus IMAPD $B$K4^$^$l$F$$$^$9!#$b$7$"$J$?(B +$B$,(B 2.0.14 $BL$K~$N(B Cyrus IMAPD $B$K4^$^$l$F$$$k(B @samp{imtest} ($B%P!<%8%g(B +$B%s(B 1.5.x $B$H(B 1.6.x) $B$r;H$C$F$$$k$J$i!"(B +@code{imap-process-connection-type} $B$r$$$8$j2s$7$F!"(B +@code{imap.el} $B$,(B @samp{imtest} $B$HDL?.$9$k$H$-$K%Q%$%W$G$O$J$/(B +$B$F(B pty $B$r;H$&$h$&$K$5$;$kI,MW$,$"$j$^$9!#$=$&$9$k$H$"$J$?$O(B IMAP $B%3%^%s(B +$B%I$N9T$ND9$5$N@)8B$KG:$^$5$l$k$G$7$g$&!#$=$l$O%a!<%k%\%C%/%9$K$?$/$5$s$N(B +$B5-;v$,$"$k$H$-$K(B Gnus $B$rL54|8B$K%O%s%0$5$;$F$7$^$&$+$b$7$l$^$;$s!#JQ(B +$B?t(B @code{imap-kerberos4-program} $B$O(B imtest $B%W%m%0%i%`$KEO$9%Q%?%a!<%?$r(B +$B4^$_$^$9!#(B @vindex imap-ssl-program SSL $B@\B3$N$?$a$N(B OpenSSL $B%W%m%0%i%`$O(B @uref{http://www.openssl.org/} $B$+(B diff --git a/texi/gnus.texi b/texi/gnus.texi index e4de4f0..5518218 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -14115,16 +14115,16 @@ Please note that the value of @code{nnimap-stream} is a symbol! @itemize @bullet @item -@dfn{gssapi:} Connect with GSSAPI (usually kerberos 5). Require the +@dfn{gssapi:} Connect with GSSAPI (usually kerberos 5). Requires the @samp{imtest} program. @item -@dfn{kerberos4:} Connect with kerberos 4. Require the @samp{imtest} program. +@dfn{kerberos4:} Connect with kerberos 4. Requires the @samp{imtest} program. @item @dfn{starttls:} Connect via the STARTTLS extension (similar to -SSL). Require the external library @samp{starttls.el} and program +SSL). Requires the external library @samp{starttls.el} and program @samp{starttls}. @item -@dfn{ssl:} Connect through SSL. Require OpenSSL (the +@dfn{ssl:} Connect through SSL. Requires OpenSSL (the program @samp{openssl}) or SSLeay (@samp{s_client}). @item @dfn{shell:} Use a shell command to start @sc{imap} connection. @@ -14133,8 +14133,13 @@ program @samp{openssl}) or SSLeay (@samp{s_client}). @end itemize @vindex imap-kerberos4-program -The @samp{imtest} program is shipped with Cyrus IMAPD, nnimap support -both @samp{imtest} version 1.5.x and version 1.6.x. The variable +The @samp{imtest} program is shipped with Cyrus IMAPD. If you're +using @samp{imtest} from Cyrus IMAPD < 2.0.14 (which includes version +1.5.x and 1.6.x) you need to frob @code{imap-process-connection-type} +to make @code{imap.el} use a pty instead of a pipe when communicating +with @samp{imtest}. You will then suffer from a line length +restrictions on IMAP commands, which might make Gnus seem to hang +indefinitely if you have many articles in a mailbox. The variable @code{imap-kerberos4-program} contain parameters to pass to the imtest program.