From: yamaoka Date: Mon, 31 Mar 2003 23:27:02 +0000 (+0000) Subject: T-gnus 6.15.18 (quimby) revision 00. X-Git-Tag: t-gnus-6_15_18-00-quimby X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1ee7d80b3fc8408a3f79e1aba971d535191a21de;p=elisp%2Fgnus.git- T-gnus 6.15.18 (quimby) revision 00. --- diff --git a/ChangeLog b/ChangeLog index db7ee5c..e6ef082 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-03-31 Katsumi Yamaoka + + * lisp/gnus-vers.el: T-gnus 6.15.18 (quimby) revision 00. + +2003-03-31 Katsumi Yamaoka + + * lisp/gnus-vers.el: T-gnus 6.15.17 revision 00. + 2003-03-24 Katsumi Yamaoka * lisp/gnus-art.el (gnus-article-x-face-command): Don't examine diff --git a/README.T-gnus b/README.T-gnus index 6fc4f7d..2ef7e1c 100644 --- a/README.T-gnus +++ b/README.T-gnus @@ -33,5 +33,5 @@ NEWS: * T-gnus 6.15 - this is based on Oort Gnus. - The latest T-gnus is T-gnus 6.15.17 (based on Oort Gnus 0.17). It + The latest T-gnus is T-gnus 6.15.18 (based on Oort Gnus 0.18). It requires SEMI 1.14, FLIM 1.14, and APEL 10.0 or later. diff --git a/README.semi b/README.semi index 04a0896..d2442d6 100644 --- a/README.semi +++ b/README.semi @@ -4,7 +4,7 @@ What is T-gnus? =============== T-gnus is an improvement of Gnus with SEMI's MIME feature. T-gnus -6.15 is based on Oort Gnus v0.17. SEMI may stand for "SEMI is Emacs +6.15 is based on Oort Gnus v0.18. SEMI may stand for "SEMI is Emacs MIME Interface" and is developped to provide an easy interfaces for users to handle MIME message structures. For further information, refer to REASME.en of SEMI. diff --git a/README.semi.ja b/README.semi.ja index bdaa04a..69c7338 100644 --- a/README.semi.ja +++ b/README.semi.ja @@ -4,7 +4,7 @@ T-gnus $B$H$O!)(B ============= T-gnus $B$O!"(BSEMI $B$rMxMQ$7$F(B Gnus $B$K(B MIME $B5!G=$rDI2C$9$k$b$N$G$9!#(B -T-gnus 6.15 $B$O(B Oort Gnus v0.17 $B$r%Y!<%9$K$7$F$$$^$9!#(BSEMI $B$O(B Emacs $B$G(B +T-gnus 6.15 $B$O(B Oort Gnus v0.18 $B$r%Y!<%9$K$7$F$$$^$9!#(BSEMI $B$O(B Emacs $B$G(B MIME $B$r;H$($k$h$&$K$9$k$b$N$G!"(BMIME message $B$N9=J8$N9=B$$HMxMQ\$7$/$O!"(BSEMI $B$N(B README.en $B$r;2>H(B $B$7$F$/$@$5$$!#(B diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 287ebc5..a42eb75 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,40 @@ +2003-03-31 Lars Magne Ingebrigtsen + + * gnus.el (gnus-version-number): Bump. + +2003-03-31 20:08:19 Lars Magne Ingebrigtsen + + * gnus.el: Oort Gnus v0.17 is released. + +2003-03-31 Lars Magne Ingebrigtsen + + * gnus-start.el (gnus-unload): Removed. + + * pop3.el (pop3-read-response): Use + nnheader-accept-process-output. + (pop3-retr): Ditto. + + * mm-view.el (mm-text-html-renderer-alist): Add -nolist to Lynx. + (mm-text-html-washer-alist): Ditto. + +2003-03-31 Simon Josefsson + + * imap.el (imap-gssapi-program): Also try GNU SASL. + (imap-gssapi-open): Accept GNU SASL greeting. + (imap-read-timeout): New. + (imap-wait-for-tag): Use it. + +2003-03-31 Lars Magne Ingebrigtsen + + * nntp.el (nntp-accept-process-output): Use new function. + + * nnheader.el (nnheader-read-timeout): New variable. + (nnheader-accept-process-output): New function. + + * nntp.el (nntp-read-timeout): Removed. + + * gnus-sum.el (gnus-summary-prepare-threads): Add comment. + 2003-03-30 Katsumi Yamaoka * gnus-cache.el (gnus-cache-braid-nov): Revoke last change. diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index f8afca8..2352372 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -219,10 +219,10 @@ colors of the displayed X-Faces." (sleep-for 1)) (setq file (car file)) (shell-command - (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | ppmnorm 2>/dev/null | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm" + (format "pnmcut -left 110 -top 30 -width 144 -height 144 '%s' | pnmscale -width 48 -height 48 | ppmtopgm > /tmp/gnus.face.ppm" file)) (let ((gnus-convert-image-to-face-command - (format "cat '%%s' | ppmchange %s | ppmquant %%d | pnmtopng" + (format "cat '%%s' | ppmquant %%d | ppmchange %s | pnmtopng" (gnus-fun-ppm-change-string)))) (setq result (gnus-face-from-file "/tmp/gnus.face.ppm"))) (delete-file file) diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el index eea50d3..488bcef 100644 --- a/lisp/gnus-start.el +++ b/lisp/gnus-start.el @@ -812,17 +812,6 @@ prompt the user for the name of an NNTP server to use." (gnus-group-set-parameter "nndraft:drafts" 'gnus-dummy '((gnus-draft-mode))))) -;;;###autoload -(defun gnus-unload () - "Unload all Gnus features. -\(For some value of `all' or `Gnus'.) Currently, features whose names -have prefixes `gnus-', `nn', `mm-' or `rfc' are unloaded. Use -cautiously -- unloading may cause trouble." - (interactive) - (dolist (feature features) - (if (string-match "^\\(gnus-\\|nn\\|mm-\\|rfc\\)" (symbol-name feature)) - (unload-feature feature 'force)))) - ;;; ;;; Dribble file diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 6074eae..6001254 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -4826,6 +4826,8 @@ or a straight list of headers." (substring gnus-tmp-from (1+ (match-beginning 0)) (1- (match-end 0)))) (t gnus-tmp-from)) + + ;; Do the %B string gnus-tmp-thread-tree-header-string (cond ((not gnus-show-threads) "") diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el index e400889..83a20bf 100644 --- a/lisp/gnus-vers.el +++ b/lisp/gnus-vers.el @@ -40,10 +40,10 @@ ;; Product information of this gnus. (product-provide 'gnus-vers (product-define "T-gnus" nil - (list 6 15 17 + (list 6 15 18 (string-to-number gnus-revision-number)))) -(defconst gnus-original-version-number "0.17" +(defconst gnus-original-version-number "0.18" "Version number for this version of Gnus.") (provide 'running-pterodactyl-gnus-0_73-or-later) diff --git a/lisp/imap.el b/lisp/imap.el index 60fe26c..15a7b60 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -178,7 +178,12 @@ the list is tried until a successful connection is made." :group 'imap :type '(repeat string)) -(defcustom imap-gssapi-program '("imtest -m gssapi -u %l -p %p %s") +(defcustom imap-gssapi-program (list + (concat "gsasl --client --connect %s:%p " + "--imap --application-data " + "--mechanism GSSAPI " + "--authentication-id %l") + "imtest -m gssapi -u %l -p %p %s") "List of strings containing commands for GSSAPI (krb5) authentication. %s is replaced with server hostname, %p with port to connect to, and %l with the value of `imap-default-user'. The program should accept @@ -246,6 +251,16 @@ encoded mailboxes which doesn't translate into ISO-8859-1." :group 'imap :type 'string) +(defcustom imap-read-timeout (if (string-match + "windows-nt\\|os/2\\|emx\\|cygwin" + (symbol-name system-type)) + 1.0 + 0.1) + "*How long to wait between checking for the end of output. +Shorter values mean quicker response, but is more CPU intensive." + :type 'number + :group 'imap) + ;; Various variables. (defvar imap-fetch-data-hook nil @@ -547,7 +562,10 @@ sure of changing the value of `foo'." (not (and (imap-parse-greeting) ;; success in imtest 1.6: (re-search-forward - "^\\(Authenticat.*\\)" nil t) + (concat "^\\(\\(Authenticat.*\\)\\|\\(" + "Client authentication " + "finished.*\\)\\)") + nil t) (setq response (match-string 1))))) (accept-process-output process 1) (sit-for 1)) @@ -1706,7 +1724,11 @@ on failure." (unless (< len 10) (setq imap-have-messaged t) (message "imap read: %dk" len)) - (accept-process-output imap-process 1))) + (accept-process-output imap-process + (truncate imap-read-timeout) + (truncate (* (- imap-read-timeout + (truncate imap-read-timeout)) + 1000))))) (when imap-have-messaged (message "")) (and (memq (process-status imap-process) '(open run)) diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 2f4c494..5425a69 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -47,7 +47,7 @@ mm-links-remove-leading-blank "links" "-dump" file) (lynx mm-inline-render-with-stdin nil - "lynx" "-dump" "-force_html" "-stdin") + "lynx" "-dump" "-force_html" "-stdin" "-nolist") (html2text mm-inline-render-with-function html2text)) "The attributes of renderer types for text/html.") @@ -60,7 +60,7 @@ mm-links-remove-leading-blank "links" "-dump" file) (lynx mm-inline-wash-with-stdin nil - "lynx" "-dump" "-force_html" "-stdin") + "lynx" "-dump" "-force_html" "-stdin" "-nolist") (html2text html2text)) "The attributes of washer types for text/html.") diff --git a/lisp/nnheader.el b/lisp/nnheader.el index b44790b..da24c44 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -79,6 +79,14 @@ Integer values will in effect be rounded up to the nearest multiple of (defvar nnheader-head-chop-length 2048 "*Length of each read operation when trying to fetch HEAD headers.") +(defvar nnheader-read-timeout + (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin" + (symbol-name system-type)) + 1.0 + 0.1) + "How long nntp should wait between checking for the end of output. +Shorter values mean quicker response, but is more CPU intensive.") + (defvar nnheader-file-name-translation-alist (let ((case-fold-search t)) (cond @@ -1629,6 +1637,14 @@ find-file-hooks, etc. standard-output (call-process shell-file-name nil t nil shell-command-switch command)))) +(defun nnheader-accept-process-output (process) + (accept-process-output + process + (truncate nnheader-read-timeout) + (truncate (* (- nnheader-read-timeout + (truncate nnheader-read-timeout)) + 1000)))) + (when (featurep 'xemacs) (require 'nnheaderxm)) diff --git a/lisp/nntp.el b/lisp/nntp.el index 6b36580..5f305a2 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -238,13 +238,6 @@ NOTE: This variable is never seen to work in Emacs 20 and XEmacs 21.") "*Hook run just before posting an article. It is supposed to be used to insert Cancel-Lock headers.") -(defvoo nntp-read-timeout (if (string-match "windows-nt\\|os/2\\|emx\\|cygwin" - (symbol-name system-type)) - 1.0 - 0.1) - "How long nntp should wait between checking for the end of output. -Shorter values mean quicker response, but is more CPU intensive.") - ;;; Internal variables. (defvar nntp-record-commands nil @@ -1374,12 +1367,7 @@ password contained in '~/.nntp-authinfo'." (unless (< len 10) (setq nntp-have-messaged t) (nnheader-message 7 "nntp read: %dk" len))) - (accept-process-output - process - (truncate nntp-read-timeout) - (truncate (* (- nntp-read-timeout - (truncate nntp-read-timeout)) - 1000))) + (nnheader-accept-process-output process) ;; accept-process-output may update status of process to indicate ;; that the server has closed the connection. This MUST be ;; handled here as the buffer restored by the save-excursion may diff --git a/lisp/pop3.el b/lisp/pop3.el index 1e17432..4996d24 100644 --- a/lisp/pop3.el +++ b/lisp/pop3.el @@ -238,7 +238,7 @@ Argument PORT specifies connecting port." (goto-char (point-max)) (forward-line -1) (not (looking-at "+OK"))) - (accept-process-output process 1) + (nnheader-accept-process-output process) (sit-for 1)) (delete-region (point-min) (point))) (and process (memq (process-status process) '(open run)) @@ -291,7 +291,7 @@ Return the response string if optional second argument RETURN is non-nil." (set-buffer (process-buffer process)) (goto-char pop3-read-point) (while (not (search-forward "\r\n" nil t)) - (accept-process-output process 0 500) + (nnheader-accept-process-output process) (goto-char pop3-read-point)) (setq match-end (point)) (goto-char pop3-read-point) @@ -699,7 +699,7 @@ If msgno is invalid, return nil. Otherwise, return a string." (set-buffer (process-buffer process)) (goto-char start) (while (not (re-search-forward "^\\.\r\n" nil t)) - (accept-process-output process 3) + (nnheader-accept-process-output process) (goto-char start)) (setq pop3-read-point (point-marker)) (goto-char (match-beginning 0)) diff --git a/texi/ChangeLog b/texi/ChangeLog index ba2c8df..b0e3b77 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,11 @@ +2003-03-31 Lars Magne Ingebrigtsen + + * gnus.texi (Exiting Gnus): Removed gnus-unload. + +2003-03-31 Simon Josefsson + + * gnus.texi (IMAP): Add. + 2003-03-27 Paul Jarc * gnus.texi (Comparing Mail Back Ends): Note nnmaildir's diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index c3f8065..533ba6f 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -3517,12 +3517,6 @@ Gnus$B$r=*N;$9$k$H$-$O(B @code{gnus-exit-gnus-hook} $B$,8F$S=P$5$l!"$5$i(B $B$K(B gnus $B$r=*N;$9$k$H$-$N:G8e$H$7(B $B$F(B @code{gnus-after-exiting-gnus-hook} $B$,8F$S=P$5$l$^$9!#(B -@findex gnus-unload -@cindex unloading -$B$b$7(B gnus $B$H$=$l$K4XO"$9$k$b$N$r40A4$K=hJ,$7$?$$$N$G$"$l$P!"(B -@code{gnus-unload} $B%3%^%s%I$,;H$($^$9!#$3$N%3%^%s%I$O!"%a%?JQ?t$r%+%9%?(B -$B%^%$%:$7$h$&$H$7$F$$$k$H$-$K$bJXMx$G$9!#(B - Note: @quotation @@ -15140,8 +15134,8 @@ Gnus $B$O%&%'%V%Z!<%8$rZ$K$h$k(B IMAP $B@\B3$r5/F0$9$k$?$a$N(B +$B%3%^%s%I9T$N%j%9%H$r;XDj$7$^$9!#$3$l$i$O@\B3$,3NN)$9$k$^$G!"$^$?$O%j%9%H(B +$B$,;H$$?T$/$5$l$k$^$G!"=g$0$j$K;n$5$l$^$9!#%G%#%U%)%k%H$G$O!"(B +@uref{http://www.gnu.org/software/gsasl/} $B$K$"$k(B GNU SASL $B$K$h(B +$B$k(B @samp{gsasl} $B$H!"(BCyrus IMAPD $B$K$h$k(B @samp{imtest} $B%W%m%0%i(B +$B%`(B (@code{imap-kerberos4-program} $B;2>H(B) $B$,;n$5$l$^$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 $B$iF~Z$G$9!#30It%W%m%0%i(B -$B%`(B @code{imtest} $B$,I,MW$G$9!#(B +$B%`(B @code{gsasl} $B$^$?$O(B @code{imtest} $B$,I,MW$G$9!#(B @item @dfn{kerberos4:} Kerberos 4 $B$K$h$kG'>Z$G$9!#30It%W%m%0%i(B $B%`(B @code{imtest} $B$,I,MW$G$9!#(B diff --git a/texi/gnus.texi b/texi/gnus.texi index f6e47fe..a4104d8 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -3440,12 +3440,6 @@ The dribble file will be saved, though (@pxref{Auto Save}). @code{gnus-after-exiting-gnus-hook} is called as the final item when exiting gnus. -@findex gnus-unload -@cindex unloading -If you wish to completely unload gnus and all its adherents, you can use -the @code{gnus-unload} command. This command is also very handy when -trying to customize meta-variables. - Note: @quotation @@ -15612,7 +15606,7 @@ Please note that the value of @code{nnimap-stream} is a symbol! @itemize @bullet @item @dfn{gssapi:} Connect with GSSAPI (usually Kerberos 5). Requires the -@samp{imtest} program. +@samp{gsasl} or @samp{imtest} program. @item @dfn{kerberos4:} Connect with Kerberos 4. Requires the @samp{imtest} program. @item @@ -15646,6 +15640,15 @@ For TLS connection, the @code{gnutls-cli} program from GNUTLS is needed. It is available from @uref{http://www.gnu.org/software/gnutls/}. +@vindex imap-gssapi-program +This parameter specifies a list of command lines that invoke a GSSAPI +authenticated IMAP stream in a subshell. They are tried sequentially +until a connection is made, or the list has been exhausted. By +default, @samp{gsasl} from GNU SASL, available from +@uref{http://www.gnu.org/software/gsasl/}, and the @samp{imtest} +program from Cyrus IMAPD (see @code{imap-kerberos4-program}), are +tried. + @vindex imap-ssl-program For SSL connections, the OpenSSL program is available from @uref{http://www.openssl.org/}. OpenSSL was formerly known as SSLeay, @@ -15678,7 +15681,7 @@ Please note that the value of @code{nnimap-authenticator} is a symbol! @itemize @bullet @item @dfn{gssapi:} GSSAPI (usually kerberos 5) authentication. Requires -external program @code{imtest}. +external program @code{gsasl} or @code{imtest}. @item @dfn{kerberos4:} Kerberos 4 authentication. Requires external program @code{imtest}.