From bbd9628dc9b99217078893c543bf39015045f27f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 21 Apr 2000 12:37:55 +0000 Subject: [PATCH] Sync with latest Gnus. --- lisp/ChangeLog | 26 ++++++++++++++++++++++++++ lisp/flow-fill.el | 6 +++--- lisp/gnus-art.el | 30 +++++++++++++++++++++++------- lisp/gnus-draft.el | 1 + lisp/gnus-util.el | 9 ++++----- lisp/gnus-win.el | 4 ++-- lisp/lpath.el | 5 +++-- lisp/mm-view.el | 2 +- texi/ChangeLog | 4 ++++ texi/gnus-ja.texi | 16 ++++++++++++++-- texi/gnus.texi | 16 ++++++++++++++-- 11 files changed, 95 insertions(+), 24 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f5216ca..7b02069 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,29 @@ +2000-04-21 14:11:39 David S. Goldberg + + * gnus-art.el (gnus-boring-article-headers): Work on long CCs as + well. + +2000-04-21 14:06:43 Rui Zhu + + * gnus-art.el (gnus-article-mode): Fix variable name. + +2000-04-21 13:54:51 Lars Magne Ingebrigtsen + + * mm-view.el: Fix autoload. + + * flow-fill.el (flow-fill): Fix provide. + + * gnus-draft.el (gnus-draft-send): Bind message-setup-hook to + nil. + +2000-04-20 22:24:04 Shenghuo ZHU + + * gnus-win.el (gnus-configure-windows): Revert to switch-to-buffer. + +2000-04-21 05:22:18 Katsumi Yamaoka + + * gnus-util.el (gnus-netrc-machine): Didn't work. + 2000-04-20 21:22:10 Shenghuo ZHU * gnus-draft.el (gnus-draft-setup): Restore to mml. diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el index b0883de..9aae7c4 100644 --- a/lisp/flow-fill.el +++ b/lisp/flow-fill.el @@ -1,4 +1,4 @@ -;;; fill-flowed.el --- interprete RFC2646 "flowed" text +;;; flow-fill.el --- interprete RFC2646 "flowed" text ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Author: Simon Josefsson @@ -89,6 +89,6 @@ (fill-flowed-point-at-eol) 'left 'nosqueeze))))))) -(provide 'fill-flowed) +(provide 'flow-fill) -;;; fill-flowed.el ends here +;;; flow-fill.el ends here diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index e80f58e..b3afcab 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -181,8 +181,8 @@ Possible values in this list are `empty', `newsgroups', `followup-to', (const :tag "Followup-to identical to newsgroups." followup-to) (const :tag "Reply-to identical to from." reply-to) (const :tag "Date less than four days old." date) - (const :tag "Very long To header." long-to) - (const :tag "Multiple To headers." many-to)) + (const :tag "Very long To and/or Cc header." long-to) + (const :tag "Multiple To and/or Cc headers." many-to)) :group 'gnus-article-hiding) (defcustom gnus-signature-separator '("^-- $" "^-- *$") @@ -1233,11 +1233,15 @@ always hide." 4)) (gnus-article-hide-header "date")))) ((eq elem 'long-to) - (let ((to (message-fetch-field "to"))) + (let ((to (message-fetch-field "to")) + (cc (message-fetch-field "cc"))) (when (> (length to) 1024) - (gnus-article-hide-header "to")))) + (gnus-article-hide-header "to")) + (when (> (length cc) 1024) + (gnus-article-hide-header "cc")))) ((eq elem 'many-to) - (let ((to-count 0)) + (let ((to-count 0) + (cc-count 0)) (goto-char (point-min)) (while (re-search-forward "^to:" nil t) (setq to-count (1+ to-count))) @@ -1249,7 +1253,19 @@ always hide." (forward-line -1) (narrow-to-region (point) (point-max)) (gnus-article-hide-header "to")) - (setq to-count (1- to-count))))))))))))) + (setq to-count (1- to-count)))) + (goto-char (point-min)) + (while (re-search-forward "^cc:" nil t) + (setq cc-count (1+ cc-count))) + (when (> cc-count 1) + (while (> cc-count 0) + (goto-char (point-min)) + (save-restriction + (re-search-forward "^cc:" nil nil cc-count) + (forward-line -1) + (narrow-to-region (point) (point-max)) + (gnus-article-hide-header "cc")) + (setq cc-count (1- cc-count))))))))))))) (defun gnus-article-hide-header (header) (save-excursion @@ -2761,7 +2777,7 @@ commands: (make-local-variable 'gnus-article-mime-handles) (make-local-variable 'gnus-article-decoded-p) (make-local-variable 'gnus-article-mime-handle-alist) - (make-local-variable 'gnus-article-washed-types) + (make-local-variable 'gnus-article-wash-types) (gnus-set-default-directory) (buffer-disable-undo) (setq buffer-read-only t) diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el index 3e6def0..8a201b3 100644 --- a/lisp/gnus-draft.el +++ b/lisp/gnus-draft.el @@ -129,6 +129,7 @@ message-inhibit-body-encoding)) (message-send-hook (and group (not (equal group "nndraft:queue")) message-send-hook)) + (message-setup-hook nil) type method) ;; We read the meta-information that says how and where ;; this message is to be sent. diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el index 66a7dfe..ee0ee22 100644 --- a/lisp/gnus-util.el +++ b/lisp/gnus-util.el @@ -915,13 +915,12 @@ ARG is passed to the first function." (when (assoc "default" (car rest)) (push (car rest) result)) (pop rest))) - (setq result (nreverse result)) - (if (null result) - nil + (when result + (setq result (nreverse result)) (while (and result - (not (equalp port (or (gnus-netrc-get result) "nntp")))) + (not (equal port (gnus-netrc-get (car result) "port")))) (pop result)) - result))) + (car result)))) (defun gnus-netrc-get (alist type) "Return the value of token TYPE from ALIST." diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el index 1da662d..89e0465 100644 --- a/lisp/gnus-win.el +++ b/lisp/gnus-win.el @@ -446,11 +446,11 @@ See the Gnus manual for an explanation of the syntax used.") (gnus-delete-windows-in-gnusey-frames)) ;; Just remove some windows. (gnus-remove-some-windows) - (set-buffer nntp-server-buffer)) + (switch-to-buffer nntp-server-buffer)) (select-frame frame))) (let (gnus-window-frame-focus) - (set-buffer nntp-server-buffer) + (switch-to-buffer nntp-server-buffer) (gnus-configure-frame split) (when gnus-window-frame-focus (select-frame (window-frame gnus-window-frame-focus)))))))) diff --git a/lisp/lpath.el b/lisp/lpath.el index c7e3c57..cf6c777 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -47,7 +47,8 @@ rmail-update-summary url-retrieve temp-directory babel-fetch babel-wash find-coding-systems-for-charsets sc-cite-regexp - vcard-pretty-print make-symbolic-link)) + vcard-pretty-print image-type-available-p + make-overlay overlay-put make-symbolic-link)) (maybe-bind '(global-face-data mark-active transient-mark-mode mouse-selection-click-count mouse-selection-click-count-buffer buffer-display-table @@ -99,7 +100,7 @@ rmail-summary-exists rmail-select-summary rmail-update-summary url-generic-parse-url valid-image-instantiator-format-p babel-fetch babel-wash sc-cite-regexp - vcard-pretty-print + vcard-pretty-print image-type-available-p coding-system-get find-coding-system find-coding-systems-for-charsets find-coding-systems-region font-lock-set-defaults function-max-args get-charset-property diff --git a/lisp/mm-view.el b/lisp/mm-view.el index 5e60146..1438f0b 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -33,7 +33,7 @@ (autoload 'gnus-article-prepare-display "gnus-art") (autoload 'vcard-parse-string "vcard") (autoload 'vcard-format-string "vcard") - (autoload 'fill-flowed "fill-flowed") + (autoload 'fill-flowed "flow-fill") (autoload 'diff-mode "diff-mode")) ;; Avoid byte compile warning. diff --git a/texi/ChangeLog b/texi/ChangeLog index 7b9c52e..9a1857f 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2000-04-21 13:45:52 Pavel Janik + + * gnus.texi (Mail Source Specifiers): Example for :plugged. + 2000-04-20 20:37:48 Pavel Janik * gnus.texi (Limiting): Fix. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index fbbf01c..258799e 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -3921,7 +3921,8 @@ From Newsgroups})$(B!#(B @item L $(B5-;v$N9T?t!#(B @item c -$(B5-;v$NJ8;z?t!#(B +$(B5-;v$NJ8;z?t!#$3$NL>A0;XDj;R$O(B (nnfolder $(B$N$h$&$J(B) $(B$$$/$D$+$NA*BrJ}K!$r(B +$(B%5%]!<%H$7$^$;$s!#(B @item I $(B%9%l%C%I$N%l%Y%k$K$h$k;z2<$2(B (@pxref{Customizing Threading})$(B!#(B @item T @@ -10775,7 +10776,18 @@ www.hotmail.com, mail.yahoo.com, www.netaddress.com, www.my-deja.com @item :plugged @code{nil} $(B$G$J$+$C$?$i!"(Bgnus $(B$,(B @dfn{unplugged} $(B$G$"$C$F$b%a!<%k$rl9g$KJXMx$G$9!#(B @end table @end table diff --git a/texi/gnus.texi b/texi/gnus.texi index 3fc9e08..e4030c8 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -3867,7 +3867,8 @@ the @code{a} spec. @item L Number of lines in the article. @item c -Number of characters in the article. +Number of characters in the article. This specifier is not supported in some +methods (like nnfolder). @item I Indentation based on thread level (@pxref{Customizing Threading}). @item T @@ -11190,7 +11191,18 @@ Keywords: @table @code @item :plugged -If non-nil, fetch the mail even when Gnus is unplugged. +If non-nil, fetch the mail even when Gnus is unplugged. If you use +directory source to get mail, you can specify it as in this example: + +@lisp +(setq mail-sources + '((directory :path "/home/pavel/.Spool/" + :suffix "" + :plugged t))) +@end lisp + +Gnus will then fetch your mail even when you are unplugged. This is +useful when you use local mail and news. @end table @end table -- 1.7.10.4