From cb7b354402c30d7193f744aa6a0ebb514854a324 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 18 Jun 2002 23:41:02 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 126 ++++++++++++++++++++++++++++------------------------ lisp/gnus-delay.el | 4 ++ lisp/gnus.el | 2 +- lisp/nnmail.el | 16 ++++++- 4 files changed, 89 insertions(+), 59 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b4b5f58..e494477 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2002-06-18 Josh Huber + + * gnus.el (gnus-find-subscribed-addresses): Use add-to-list + instead of push to ignore duplicate to-(list|address) values. + * nnmail.el (nnmail-cache-ignore-groups): New. + * nnmail.el (nnmail-cache-insert): Obey nnmail-cache-ignore-groups + +2002-06-18 Kai Gro,b_(Bjohann + + * gnus-delay.el (gnus-delay-send-queue): Delete the delay header + before sending. Suggested by Jan Rychter. + 2002-06-18 Katsumi Yamaoka * dgnushack.el (remove): New compiler macro. @@ -12,7 +24,7 @@ 2002-06-16 Kai Gro,b_(Bjohann - * gnus-agent.el (gnus-agent-read-servers) + * gnus-agent.el (gnus-agent-read-servers) (gnus-agent-write-servers): Put server name (string like "nnchoke:frumple") in the file instead of a server specification (Lisp expression like (nnchoke "frumple" ...parameters...)). @@ -27,7 +39,7 @@ * nnheader.el (nnheader-file-name-translation-alist): Set the default value for MS Windows systems. - + * gnus-ems.el (nnheader-file-name-translation-alist): Removed. 2002-06-14 Katsumi Yamaoka @@ -78,12 +90,12 @@ * message.el (message-send-mail-with-sendmail): Improve error message. -2002-06-06 Kai Gro,A_(Bjohann +2002-06-06 Kai Gro,b_(Bjohann * message.el (message-interactive): Change default from nil to t. Better to be safe than to be fast. -2002-06-05 Kai Gro,A_(Bjohann +2002-06-05 Kai Gro,b_(Bjohann * message.el (message-send-mail-with-sendmail): Check return value from call-process-region. @@ -107,7 +119,7 @@ * nnmail.el (nnmail-mail-splitting-decodes): New variable. (nnmail-article-group): Use it. -2002-05-30 Kai Gro,A_(Bjohann +2002-05-30 Kai Gro,b_(Bjohann * gnus-msg.el (gnus-inews-yank-articles): Merge split header lines so that code reading them won't be surprised. From Jesper Harder @@ -128,7 +140,7 @@ * gnus-group.el (gnus-group-line-format): Doc fix. -2002-05-28 Kai Gro,A_(Bjohann +2002-05-28 Kai Gro,b_(Bjohann * gnus-msg.el (gnus-inews-yank-articles): Unfold headers of original article before yanking. From Jesper Harder @@ -238,7 +250,7 @@ * nndoc.el (nndoc-mime-digest-type-p): Set proper file-end. -2002-05-08 Kai Gro,A_(Bjohann +2002-05-08 Kai Gro,b_(Bjohann From Florian Weimer . * gnus.el (subscribed): New group parameter. @@ -253,13 +265,13 @@ frobbing the alist directly. * mml.el (mml-generate-mime-1): Use accessor function. -2002-05-08 Kai Gro,A_(Bjohann +2002-05-08 Kai Gro,b_(Bjohann * gnus-art.el (gnus-article-mode-syntax-table): Specify matching parenthesis for "<" and ">". Suggested by Andreas Schwab . -2002-05-07 Kai Gro,A_(Bjohann +2002-05-07 Kai Gro,b_(Bjohann * nnmail.el (nnmail-cache-insert): Prefer group-art over group when intuiting the group the message is written to. From Josh @@ -425,7 +437,7 @@ * gnus-art.el (article-unsplit-urls): Allow trailing SPC. -2002-04-24 Kai Gro,A_(Bjohann +2002-04-24 Kai Gro,b_(Bjohann From Dan Christensen . * nndoc.el (nndoc-type-alist, nndoc-lanl-gov-announce-type-p) @@ -448,7 +460,7 @@ (gnus-netrc-get, gnus-netrc-machine, gnus-parse-netrc): Aliased to new code in netrc.el. -2002-04-23 Kai Gro,A_(Bjohann +2002-04-23 Kai Gro,b_(Bjohann * gnus-msg.el (gnus-summary-resend-message-edit): Remove message-ignored-resent-headers, too. From Matthieu Moy @@ -517,7 +529,7 @@ * message.el (message-gen-unsubscribed-mft): accept a prefix argument so CC can be included with C-u C-c C-f C-a -2002-04-17 Kai Gro,A_(Bjohann +2002-04-17 Kai Gro,b_(Bjohann From Ted Zlatanov . * spam.el (spam-whitelist, spam-blacklist, spam-enter-whitelist): @@ -670,7 +682,7 @@ * gnus.el (gnus-summary-line-format): Fixing links to Info. Trivial change from Bj,Av(Brn Torkelsson . -2002-03-29 Kai Gro,A_(Bjohann +2002-03-29 Kai Gro,b_(Bjohann * gnus-sum.el (gnus-summary-move-article) (gnus-summary-copy-article): Mention `gnus-move-split-methods' in @@ -770,7 +782,7 @@ * gnus-group.el (gnus-group-process-prefix): Make sure there is a mark. -2002-03-19 Kai Gro,A_(Bjohann +2002-03-19 Kai Gro,b_(Bjohann * gnus-sum.el (gnus-sum-thread-tree-root) (gnus-sum-thread-tree-single-indent) @@ -2264,7 +2276,7 @@ * flow-fill.el (fill-flowed-display-column) (fill-flowed-encode-columnq): New variables. Suggested by - Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro,A_(Bjohann). + Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro,b_(Bjohann). (fill-flowed-encode, fill-flowed): Use them. * message.el (message-send-news, message-send-mail): Use @@ -2720,7 +2732,7 @@ * gnus-agent.el (gnus-agent-fetch-session): Run hook. -2002-01-03 Kai Gro,A_(Bjohann +2002-01-03 Kai Gro,b_(Bjohann * gnus-start.el (gnus-read-init-file): Don't force coding system for ~/.gnus. From Dave Love . @@ -3681,7 +3693,7 @@ * message.el (message-tab-body-function): Set to nil. (message-tab): Use text-mode-map or global-map. - Suggested by Kai Gro,A_(Bjohann . + Suggested by Kai Gro,b_(Bjohann . 2001-11-30 Simon Josefsson @@ -3695,7 +3707,7 @@ * gnus-agent.el (gnus-agent-write-active): Make sure sym is a cons of integers. -2001-11-29 Kai Gro,A_(Bjohann +2001-11-29 Kai Gro,b_(Bjohann * message.el (message-newgroups-header-regexp) (message-completion-alist, message-tab-body-function): Use @@ -3778,7 +3790,7 @@ (gnus-summary-limit-to-extra): Ditto. (gnus-summary-find-matching): Support not-matching argument. -2001-11-25 Kai Gro,A_(Bjohann +2001-11-25 Kai Gro,b_(Bjohann * message.el (message-wash-subject): Use `insert' rather than `insert-string', which is deprecated. @@ -3953,7 +3965,7 @@ * gnus.el (gnus-local-domain): Fix doc. From Pavel Jan,Am(Bk . -2001-11-09 Kai Gro,A_(Bjohann +2001-11-09 Kai Gro,b_(Bjohann * message.el (message-point-in-header-p): New function. (message-do-auto-fill): Use it. @@ -4296,7 +4308,7 @@ (nnweb-type-definition): Add google as alias of dejanews. (nnweb-google-parse-1): Forward 1 line. -2001-10-26 Kai Gro,A_(Bjohann +2001-10-26 Kai Gro,b_(Bjohann * gnus-msg.el (gnus-summary-mail-forward): Doc fix: add pointer to variable `message-forward-ignored-headers'. @@ -4332,7 +4344,7 @@ * gnus-msg.el (gnus-extended-version): Include system-configuration. - Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro,A_(Bjohann). + Suggested by Kai.Grossjohann@CS.Uni-Dortmund.DE (Kai Gro,b_(Bjohann). 2001-10-22 Per Abrahamsen @@ -4352,7 +4364,7 @@ (nnimap-split-inbox, nnimap-expunge-search-string) (nnimap-importantize-dormant): Remove "*" from doc. -2001-10-20 Kai Gro,A_(Bjohann +2001-10-20 Kai Gro,b_(Bjohann * gnus-sum.el (gnus-summary-limit-to-score): Prompt for score if not supplied via prefix arg. From Lisp, make arg mandatory. @@ -4363,7 +4375,7 @@ * message.el (message-do-auto-fill): Avoid calling 'rfc822-goto-eoh'. -2001-10-20 Kai Gro,A_(Bjohann +2001-10-20 Kai Gro,b_(Bjohann From Paul Jarc . * message.el (message-get-reply-headers): Restructure the logic @@ -4456,7 +4468,7 @@ * gnus-msg.el (gnus-post-method): Changed two instances of `active' to `current' and one `null' to `not'. -2001-10-16 Kai Gro,A_(Bjohann +2001-10-16 Kai Gro,b_(Bjohann From Katsumi Yamaoka . * message.el (message-setup-fill-variables): Use @@ -4468,7 +4480,7 @@ (mml2015-gpg-decrypt-1): Decanonicalize decrypted MIME body. (Mailcrypt seem to do this, but gpg.el doesn't.) -2001-10-16 Kai Gro,A_(Bjohann +2001-10-16 Kai Gro,b_(Bjohann Patch by Oliver Scholz . * gnus-draft.el (gnus-draft-edit-message): Add text property @@ -4523,7 +4535,7 @@ * message.el (message-do-auto-fill): Use gnus-point-at-bol. (autoload): Add some autoloads. -2001-10-12 Kai Gro,A_(Bjohann +2001-10-12 Kai Gro,b_(Bjohann Suggested by Oliver Scholz . * message.el (message-do-auto-fill): New function. Like @@ -4675,7 +4687,7 @@ * gnus-sum.el (gnus-summary-extract-address-component): New function. (gnus-summary-from-or-to-or-newsgroups): Optimize. -2001-09-29 Kai Gro,A_(Bjohann +2001-09-29 Kai Gro,b_(Bjohann * message.el (message-mode-map): Keybinding for `gnus-delay-article'. (message-mode-menu): Menu item for same. @@ -4782,7 +4794,7 @@ * gnus-group.el (gnus-group-catchup): Update expire marks in backend. Also, if ALL also set expire marks on tick/dormant. -2001-09-20 Kai Gro,A_(Bjohann +2001-09-20 Kai Gro,b_(Bjohann * message.el (message-tab-body-function): New variable. * message.el (message-tab): Use it. @@ -4993,7 +5005,7 @@ * gnus-sum.el (gnus-summary-insert-line): Insert forwarded, recent and unseen marks. -2001-09-05 Kai Gro,A_(Bjohann +2001-09-05 Kai Gro,b_(Bjohann * nnmail.el (nnmail-split-fancy): Document `junk'. @@ -5489,7 +5501,7 @@ * gnus-srvr.el (gnus-server-browse-in-group-buffer): Default to nil. -2001-08-15 Kai Gro,A_(Bjohann +2001-08-15 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-article): Allow "01:23" time spec, which specifies a time today or tomorrow. @@ -5500,7 +5512,7 @@ * gnus-agent.el (gnus-agent-make-mode-line-string) (gnus-agent-toggle-plugged): Use new API. -2001-08-14 Kai Gro,A_(Bjohann +2001-08-14 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-send-drafts): Fix check whether deadline has expired. @@ -5541,7 +5553,7 @@ * gnus-spec.el (gnus-format-specs): %n is 23 chars. 2001-08-11 09:40:00 Karl Kleinpaste - Committed by Kai Gro,A_(Bjohann. + Committed by Kai Gro,b_(Bjohann. * gnus-score.el (gnus-score-string): Fix `match' regexp for `extra' header case. @@ -5560,7 +5572,7 @@ (nndoc-oe-dbx-dissection): New function. (nndoc-oe-dbx-generate-article): New function. -2001-08-11 Kai Gro,A_(Bjohann +2001-08-11 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-send-drafts): Cleaner way to check whether deadline has been reached. Patch from Dan Nicolaescu @@ -5701,7 +5713,7 @@ before remove. (gnus-mime-security-show-details): Ditto. -2001-08-04 Kai Gro,A_(Bjohann +2001-08-04 Kai Gro,b_(Bjohann * nnmail.el (nnmail-split-fancy-with-parent): Correct `mapconcat' syntax. Protect string-match against nil string and regexp. @@ -5800,7 +5812,7 @@ (gnus-read-newsrc-el-file, gnus-save-newsrc-file) (gnus-slave-save-newsrc): Use it. -2001-07-31 Kai Gro,A_(Bjohann +2001-07-31 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-initialize): Use standard define-key syntax. @@ -5896,7 +5908,7 @@ calls widen. Thanks to Christoph Conrad . -2001-07-29 Kai Gro,A_(Bjohann +2001-07-29 Kai Gro,b_(Bjohann * gnus.el (gnus-summary-line-format): Mention `gnus-sum-thread-*' for %B spec. @@ -5988,7 +6000,7 @@ * nnheader.el (nnheader-translate-file-chars): cygwin32 is running in M$Windows too. -2001-07-26 Kai Gro,A_(Bjohann +2001-07-26 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-send-drafts): Don't `error'. @@ -6071,7 +6083,7 @@ * mm-decode.el (mm-remove-part): Don't murder the current window (nil). (mm-display-external): Use display-term configure. -2001-07-24 Kai Gro,A_(Bjohann +2001-07-24 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-default-hour): New variable. (gnus-delay-article): Allow specific date in YYYY-MM-DD format. @@ -6106,7 +6118,7 @@ `gnus-check-bogus-newsgroups' just after the native server is opened. -2001-07-23 Kai Gro,A_(Bjohann +2001-07-23 Kai Gro,b_(Bjohann * nnmail.el (nnmail-do-request-post): Util function to be used by `nnchoke-request-post' for all nnmail-derived backends. @@ -6124,7 +6136,7 @@ * gnus-msg.el (gnus-setup-message): make-local-hook. -2001-07-22 Kai Gro,A_(Bjohann +2001-07-22 Kai Gro,b_(Bjohann * gnus-delay.el (gnus-delay-article): Fix `read-string' for XEmacs. Allow more units. Submitted by Karl Kleinpaste @@ -6134,7 +6146,7 @@ whether the groups exist, check the right server based on `gnus-post-method'. -2001-07-21 Kai Gro,A_(Bjohann +2001-07-21 Kai Gro,b_(Bjohann * gnus-delay.el: New file. @@ -6149,7 +6161,7 @@ (article-de-base64-unreadable, article-wash-html): (gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto. -2001-07-21 Kai Gro,A_(Bjohann +2001-07-21 Kai Gro,b_(Bjohann * nnml.el (nnml-request-post): New function. Can be used for annotations in nnml groups. @@ -6216,7 +6228,7 @@ * gnus-art.el (gnus-article-edit-mode): Use define-derived-mode. -2001-07-16 Kai Gro,A_(Bjohann +2001-07-16 Kai Gro,b_(Bjohann * message.el (message-citation-line-function): Refer to gnus-cite-attribution-suffix. @@ -6720,7 +6732,7 @@ * gnus-sum.el (gnus-summary-catchup): New argument. (gnus-summary-catchup-from-here): New function. -2001-05-30 Kai Gro,A_(Bjohann +2001-05-30 Kai Gro,b_(Bjohann * mm-view.el (mm-inline-image-xemacs): Insert newline, then move back, then insert glyph. (Before, the glyph was inserted first, @@ -6728,7 +6740,7 @@ it is not possible to insert a character after a glyph which is at the end of a buffer. Patch by Lloyd Zusman . -2001-05-28 Kai Gro,A_(Bjohann +2001-05-28 Kai Gro,b_(Bjohann From Jaap-Henk Hoepman (jhh@xs4all.nl). @@ -6737,7 +6749,7 @@ mm-destroy-postponed-undisplay-list): New functions. (mm-display-external): Use them. -2001-05-27 Kai Gro,A_(Bjohann +2001-05-27 Kai Gro,b_(Bjohann * gnus-salt.el (gnus-tree-highlight-node): Bind `default-high' and `default-low' when evaluating `gnus-summary-highlight'. @@ -6752,7 +6764,7 @@ as details. (mml2015-mailcrypt-clear-verify): Ditto. -2001-05-24 Kai Gro,A_(Bjohann +2001-05-24 Kai Gro,b_(Bjohann From Nevin Kapur . * gnus-sum.el (gnus-summary-default-high-score, @@ -6930,7 +6942,7 @@ matching subjects. (gnus-offer-save-summaries): Clean up. -2001-04-13 Kai Gro,A_(Bjohann +2001-04-13 Kai Gro,b_(Bjohann * nnmail.el (nnmail-split-fancy-with-parent): Add docstring. @@ -6951,7 +6963,7 @@ supported. Suggest by Jim Meyering . 2001-04-02 Nevin Kapur - Committed by Kai Gro,A_(Bjohann . + Committed by Kai Gro,b_(Bjohann . * nnmail.el (nnmail-split-it): Added check for .* at the end of regexp in nnmail-split-fancy. @@ -7172,7 +7184,7 @@ `nnimap-use-nov-p' (it really tested the negative). (nnimap-retrieve-headers): Use it. -2001-03-11 Kai Gro,A_(Bjohann +2001-03-11 Kai Gro,b_(Bjohann * message.el (message-generate-headers-first): Update doc. @@ -7404,7 +7416,7 @@ * gnus-draft.el (gnus-draft-reminder): "Confirm to exit?" -2001-02-19 Kai Gro,A_(Bjohann +2001-02-19 Kai Gro,b_(Bjohann * gnus-sum.el (gnus-thread-sort-functions): Doc fix. Refer to gnus-article-sort-functions. @@ -7524,7 +7536,7 @@ (gnus-subscribe-hierarchically): Return gnus-subscribe-newsgroup's return . -2001-02-12 Kai Gro,A_(Bjohann +2001-02-12 Kai Gro,b_(Bjohann * gnus-cus.el (gnus-score-customize): Doc fix. @@ -7617,7 +7629,7 @@ * gnus-uu.el (gnus-uu-grab-articles): Shoot down original article buffer. -2001-02-07 Kai Gro,A_(Bjohann +2001-02-07 Kai Gro,b_(Bjohann * message.el (message-generate-headers-first): Doc fix. @@ -8341,7 +8353,7 @@ * message.el (message-forward): Save-restriction. -2000-12-21 Kai Gro,A_(Bjohann +2000-12-21 Kai Gro,b_(Bjohann * gnus-art.el (article-treat-dumbquotes): More doc, provided by Paul Stevenson @@ -9434,7 +9446,7 @@ * message.el (message-font-lock-keywords): use message-cite-prefix-regexp. -2000-11-15 Kai Gro,A_(Bjohann +2000-11-15 Kai Gro,b_(Bjohann * gnus-group.el (gnus-group-jump-to-group-prompt): New variable by Stein Arild Str,Ax(Bmme. @@ -9569,7 +9581,7 @@ * gnus-art.el (gnus-mime-display-alternative): Show button if no preferred part. -2000-11-07 Kai Gro,A_(Bjohann +2000-11-07 Kai Gro,b_(Bjohann * gnus-sum.el (gnus-move-split-methods): Say that `gnus-split-methods' uses file names, whereas this uses group diff --git a/lisp/gnus-delay.el b/lisp/gnus-delay.el index 7e712b8..cb4fc91 100644 --- a/lisp/gnus-delay.el +++ b/lisp/gnus-delay.el @@ -145,10 +145,14 @@ DELAY is a string, giving the length of the time. Possible values are: (interactive) (save-excursion (let* ((group (format "nndraft:%s" gnus-delay-group)) + (message-send-hook (copy-sequence message-send-hook)) articles article deadline) (when (gnus-gethash group gnus-newsrc-hashtb) (gnus-activate-group group) + (add-hook 'message-send-hook + '(lambda () + (message-remove-header gnus-delay-header))) (setq articles (nndraft-articles)) (while (setq article (pop articles)) (gnus-request-head article group) diff --git a/lisp/gnus.el b/lisp/gnus.el index 9ea4259..0bad07b 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -2542,7 +2542,7 @@ with a `subscribed' parameter." (or (gnus-group-fast-parameter group 'to-address) (gnus-group-fast-parameter group 'to-list)))) (when address - (push address addresses)))) + (add-to-list 'addresses address)))) (when addresses (list (mapconcat 'regexp-quote addresses "\\|"))))) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 9548dad..c126487 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -122,6 +122,15 @@ If nil, the first match found will be used." (regexp :value ".*") (repeat :value (".*") regexp))) +(defcustom nnmail-cache-ignore-groups nil + "Regexp that matches group names to be ignored when inserting message +ids into the cache (`nnmail-cache-insert'). This can also be a list +of regexps." + :group 'nnmail-split + :type '(choice (const :tag "none" nil) + (regexp :value ".*") + (repeat :value (".*") regexp))) + ;; Added by gord@enci.ucalgary.ca (Gordon Matzigkeit). (defcustom nnmail-keep-last-article nil "If non-nil, nnmail will never delete/move a group's last article. @@ -1478,7 +1487,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (if (and grp (not (string= "" grp)) (gnus-methods-equal-p gnus-command-method (nnmail-cache-primary-mail-backend))) - (insert id "\t" grp "\n") + (let ((regexp (if (consp nnmail-cache-ignore-groups) + (mapconcat 'identity nnmail-cache-ignore-groups + "\\|") + nnmail-cache-ignore-groups))) + (unless (and regexp (string-match regexp grp)) + (insert id "\t" grp "\n"))) (insert id "\n"))))) (defun nnmail-cache-primary-mail-backend () -- 1.7.10.4