From 0daed1560793e12fd12cca73362e16de3f22ee34 Mon Sep 17 00:00:00 2001 From: shuhei-k Date: Sun, 1 Mar 1998 20:27:34 +0000 Subject: [PATCH] Revert to original. (Maintenance for snapshot, no code change. Don't include in ChangeLog.) --- lisp/ChangeLog | 153 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- lisp/nnmail.el | 55 ++++++++++---------- lisp/nnmh.el | 4 +- 3 files changed, 183 insertions(+), 29 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 60cdafb..9bafbe5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,10 +1,161 @@ +Sat Feb 28 08:27:20 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.34 is released. + +Sat Feb 28 08:17:37 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.33 is released. + +Sat Feb 28 08:10:27 1998 Lars Magne Ingebrigtsen + + * gnus-picon.el (gnus-picons-display-x-face): `buf' -- unbound + var. + +Sat Feb 28 08:03:23 1998 François Pinard + + * gnus: configure'd. + +Sat Feb 28 07:43:00 1998 Nelson Jose dos Santos Ferreira + + * nnsoup.el (nnsoup-store-reply): Fix double sep error. + +Sat Feb 28 07:01:17 1998 Lasse Rasinen + + * gnus-start.el (gnus-ask-server-for-new-groups): Message more. + +Fri Feb 27 13:26:34 1998 Lars Magne Ingebrigtsen + + * message.el (message-resend): Allow arbitrary Also's. + +1998-02-27 Dave Love + + * gnus-sum.el (gnus-simplify-subject-functions): Fix + customization, doc. + +1998-02-25 Dave Love + + * gnus-art.el (gnus-article-x-face-command): Replace leading `{'. + +Mon Feb 23 18:26:48 1998 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-plugged): New command and keystroke. + + * gnus-ems.el (gnus-ems-redefine): Define + 'gnus-summary-set-display-table as a function that takes no + params. + + * gnus.el (gnus-interactive): Don't use gnus-sum macros. + (gnus-valid-select-methods): Include nnlistserv. + + * gnus.el: Autoloaded things to make byte-comp silent. + +Mon Feb 23 18:06:47 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.32 is released. + +Mon Feb 23 17:48:42 1998 Lars Magne Ingebrigtsen + + * gnus-cite.el (gnus-article-hide-citation-maybe): Wrong + interactive specs. + (gnus-cite-toggle): Maybe parse. + +Mon Feb 23 05:26:11 1998 Rui-Tao Dong ~{6-HpLN~} + + * nnweb.el (nnweb-type-definition): Fixed. + +Sun Feb 22 18:10:53 1998 Lars Magne Ingebrigtsen + + * gnus-agent.el (gnus-agent-group-path): Translate right chars. + (gnus-agent-toggle-plugged): Allow proper closing. + + * gnus-srvr.el (gnus-browse-read-group): Allow entering + non-ephemeral groups. + +Sun Feb 22 04:21:15 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.31 is released. + +Sun Feb 22 02:09:35 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-highlight): Give undownloaded marks a + better face. + + * gnus-score.el (gnus-score-set): Take optional "warn". + (gnus-summary-score-entry): Use it. + + * gnus.el: Removed spurious * in defcustoms. + + * gnus-score.el (gnus-score-load-file): Reverse logic. + + * gnus-cite.el (gnus-article-hide-citation): Use markers to make + things work when wrapping. + + * gnus-sum.el (gnus-summary-exit): Stop prefetch. + +Sat Feb 21 02:12:42 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-get-newsgroup-headers): Buggy regexp. + +Sat Feb 21 00:51:22 1998 Lars Magne Ingebrigtsen + + * gnus.el: Quassia Gnus v0.30 is released. + +Sat Feb 21 00:09:14 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-mark-article): Don't do anything if + the mark doesn't change. + + * gnus-art.el (gnus-article-prepare): Don't enter article into + cache. + + * gnus-sum.el (gnus-summary-reparent-thread): Don't mark as read. + (gnus-summary-mark-article): Don't do cache things here. + + * gnus-util.el (gnus-parse-netrc): Skip past macdefs. + +Fri Feb 20 22:56:22 1998 Lars Magne Ingebrigtsen + + * gnus-srvr.el (gnus-browse-unsubscribe-group): Wouldn't allow + unsubscription. + + * gnus-sum.el (gnus-summary-insert-subject): Allow inserting + articles outside limits. + + * gnus-start.el (gnus-dribble-enter): Update mode line. + + * gnus-srvr.el (gnus-browse-unsubscribe-group): Allow + unsubscription. + + * gnus-picon.el (gnus-article-display-picons): Check that the + extents are live first. + +Thu Feb 19 15:13:44 1998 Lars Magne Ingebrigtsen + + * gnus-group.el (gnus-useful-groups): Include gnus-bug. + +Thu Feb 19 02:28:17 1998 Jens-Ulrik Holger Petersen + + * gnus.el (gnus-group-history): Defined twice. + +Thu Feb 19 01:58:47 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-get-newsgroup-headers): Just use the header + value. + (gnus-summary-exit): Set global vars. + +Tue Feb 17 07:17:49 1998 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-stop-page-breaking): Mark page as no + longer broken. + (gnus-summary-exit): Purge the real name. + Tue Feb 17 07:00:43 1998 Lars Magne Ingebrigtsen * gnus.el: Quassia Gnus v0.29 is released. Tue Feb 17 06:15:03 1998 Lars Magne Ingebrigtsen - * nnmail.el (nnmail-purge-split-history): List if alists, not + * nnmail.el (nnmail-purge-split-history): List of alists, not alist. Mon Feb 16 20:22:04 1998 Lars Magne Ingebrigtsen diff --git a/lisp/nnmail.el b/lisp/nnmail.el index e326b09..5c0cd70 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -33,7 +33,9 @@ (require 'custom) (eval-and-compile - (autoload 'gnus-error "gnus-util")) + (autoload 'gnus-error "gnus-util") + (autoload 'gnus-buffer-live-p "gnus-util") + (autoload 'gnus-encode-coding-string "gnus-ems")) (defgroup nnmail nil "Reading mail with Gnus." @@ -106,14 +108,14 @@ This variable can also have a function as its value." ;; Suggested by Erik Selberg . (defcustom nnmail-crosspost t - "*If non-nil, do crossposting if several split methods match the mail. + "If non-nil, do crossposting if several split methods match the mail. If nil, the first match found will be used." :group 'nnmail-split :type 'boolean) ;; 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. + "If non-nil, nnmail will never delete/move a group's last article. It can be marked expirable, so it will be deleted when it is no longer last. You may need to set this variable if other programs are putting @@ -123,14 +125,14 @@ new mail into folder numbers that Gnus has marked as expired." :type 'boolean) (defcustom nnmail-use-long-file-names nil - "*If non-nil the mail backends will use long file and directory names. + "If non-nil the mail backends will use long file and directory names. If nil, groups like \"mail.misc\" will end up in directories like \"mail/misc/\"." :group 'nnmail-files :type 'boolean) (defcustom nnmail-default-file-modes 384 - "*Set the mode bits of all new mail files to this integer." + "Set the mode bits of all new mail files to this integer." :group 'nnmail-files :type 'integer) @@ -145,7 +147,7 @@ can also be `immediate' and `never'." (const never))) (defcustom nnmail-expiry-wait-function nil - "*Variable that holds function to specify how old articles should be before they are expired. + "Variable that holds function to specify how old articles should be before they are expired. The function will be called with the name of the group that the expiry is to be performed in, and it should return an integer that says how many days an article can be stored before it is considered @@ -164,7 +166,7 @@ Eg.: (function :format "%v" nnmail-))) (defcustom nnmail-cache-accepted-message-ids nil - "*If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache." + "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache." :group 'nnmail :type 'boolean) @@ -182,7 +184,7 @@ treat all files in that directory as incoming spool files." :type 'file) (defcustom nnmail-crash-box "~/.gnus-crash-box" - "*File where Gnus will store mail while processing it." + "File where Gnus will store mail while processing it." :group 'nnmail-files :type 'file) @@ -211,7 +213,7 @@ several files - eg. \".spool[0-9]*\"." :type 'boolean) (defcustom nnmail-delete-file-function 'delete-file - "*Function called to delete files in some mail backends." + "Function called to delete files in some mail backends." :group 'nnmail-files :type 'function) @@ -278,25 +280,25 @@ If you use `display-time', you could use something like this: ;; Suggested by Erik Selberg . (defcustom nnmail-prepare-incoming-hook nil - "*Hook called before treating incoming mail. + "Hook called before treating incoming mail. The hook is run in a buffer with all the new, incoming mail." :group 'nnmail-prepare :type 'hook) (defcustom nnmail-prepare-incoming-header-hook nil - "*Hook called narrowed to the headers of each message. + "Hook called narrowed to the headers of each message. This can be used to remove excessive spaces (and stuff like that) from the headers before splitting and saving the messages." :group 'nnmail-prepare :type 'hook) (defcustom nnmail-prepare-incoming-message-hook nil - "*Hook called narrowed to each message." + "Hook called narrowed to each message." :group 'nnmail-prepare :type 'hook) (defcustom nnmail-list-identifiers nil - "*Regexp that matches list identifiers to be removed. + "Regexp that matches list identifiers to be removed. This can also be a list of regexps." :group 'nnmail-prepare :type '(choice (const :tag "none" nil) @@ -304,17 +306,17 @@ This can also be a list of regexps." (repeat :value (".*") regexp))) (defcustom nnmail-pre-get-new-mail-hook nil - "*Hook called just before starting to handle new incoming mail." + "Hook called just before starting to handle new incoming mail." :group 'nnmail-retrieve :type 'hook) (defcustom nnmail-post-get-new-mail-hook nil - "*Hook called just after finishing handling new incoming mail." + "Hook called just after finishing handling new incoming mail." :group 'nnmail-retrieve :type 'hook) (defcustom nnmail-split-hook nil - "*Hook called before deciding where to split an article. + "Hook called before deciding where to split an article. The functions in this hook are free to modify the buffer contents in any way they choose -- the buffer contents are discarded after running the split process." @@ -338,7 +340,7 @@ messages will be shown to indicate the current status." :type 'integer) (defcustom nnmail-split-fancy "mail.misc" - "*Incoming mail can be split according to this fancy variable. + "Incoming mail can be split according to this fancy variable. To enable this, set `nnmail-split-methods' to `nnmail-split-fancy'. The format is this variable is SPLIT, where SPLIT can be one of @@ -752,7 +754,7 @@ is a spool. If not using procmail, return GROUP." (goto-char (point-min)) (when (looking-at ">From ") (replace-match "X-From-Line: ") ) - (gnus-run-hooks 'nnmail-prepare-incoming-header-hook) + (run-hooks 'nnmail-prepare-incoming-header-hook) (goto-char (point-max)) ;; Find the Message-ID header. (save-excursion @@ -912,7 +914,7 @@ is a spool. If not using procmail, return GROUP." ;; having a (possibly) faulty header. (beginning-of-line) (insert "X-")) - (gnus-run-hooks 'nnmail-prepare-incoming-header-hook) + (run-hooks 'nnmail-prepare-incoming-header-hook) ;; Find the end of this article. (goto-char (point-max)) (widen) @@ -987,7 +989,7 @@ is a spool. If not using procmail, return GROUP." (insert "Original-"))) (forward-line 1) (insert "Message-ID: " (setq message-id (nnmail-message-id)) "\n")) - (gnus-run-hooks 'nnmail-prepare-incoming-header-hook) + (run-hooks 'nnmail-prepare-incoming-header-hook) ;; Find the end of this article. (goto-char (point-max)) (widen) @@ -1024,7 +1026,7 @@ FUNC will be called with the buffer narrowed to each mail." (nnheader-insert-file-contents incoming) (unless (zerop (buffer-size)) (goto-char (point-min)) - (save-excursion (gnus-run-hooks 'nnmail-prepare-incoming-hook)) + (save-excursion (run-hooks 'nnmail-prepare-incoming-hook)) ;; Handle both babyl, MMDF and unix mail formats, since movemail will ;; use the former when fetching from a mailbox, the latter when ;; fetching from a file. @@ -1066,7 +1068,7 @@ FUNC will be called with the group name to determine the article number." (while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t) (replace-match " " t t)) ;; Allow washing. - (gnus-run-hooks 'nnmail-split-hook) + (run-hooks 'nnmail-split-hook) (if (and (symbolp nnmail-split-methods) (fboundp nnmail-split-methods)) (let ((split @@ -1494,7 +1496,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (message-fetch-field header)))) (defun nnmail-check-duplication (message-id func artnum-func) - (gnus-run-hooks 'nnmail-prepare-incoming-message-hook) + (run-hooks 'nnmail-prepare-incoming-message-hook) ;; If this is a duplicate message, then we do not save it. (let* ((duplication (nnmail-cache-id-exists-p message-id)) (case-fold-search t) @@ -1551,7 +1553,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." ;; We first activate all the groups. (nnmail-activate method) ;; Allow the user to hook. - (gnus-run-hooks 'nnmail-pre-get-new-mail-hook) + (run-hooks 'nnmail-pre-get-new-mail-hook) ;; Open the message-id cache. (nnmail-cache-open) ;; The we go through all the existing spool files and split the @@ -1596,12 +1598,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." (nnmail-get-value "%s-active-file" method)) (when exit-func (funcall exit-func)) - (gnus-run-hooks 'nnmail-read-incoming-hook) + (run-hooks 'nnmail-read-incoming-hook) (nnheader-message 3 "%s: Reading incoming mail...done" method)) ;; Close the message-id cache. (nnmail-cache-close) ;; Allow the user to hook. - (gnus-run-hooks 'nnmail-post-get-new-mail-hook) + (run-hooks 'nnmail-post-get-new-mail-hook) ;; Delete all the temporary files. (while incomings (setq incoming (pop incomings)) @@ -1739,6 +1741,7 @@ If ARGS, PROMPT is used as an argument to `format'." (princ "\n"))))) (defun nnmail-purge-split-history (group) + "Remove all instances of GROUP from `nnmail-split-history'." (let ((history nnmail-split-history) prev) (while history diff --git a/lisp/nnmh.el b/lisp/nnmh.el index 0001703..ab9716c 100644 --- a/lisp/nnmh.el +++ b/lisp/nnmh.el @@ -429,8 +429,8 @@ (unless noinsert (nnmail-insert-lines) (nnmail-insert-xref group-art)) - (gnus-run-hooks 'nnmail-prepare-save-mail-hook) - (gnus-run-hooks 'nnmh-prepare-save-mail-hook) + (run-hooks 'nnmail-prepare-save-mail-hook) + (run-hooks 'nnmh-prepare-save-mail-hook) (goto-char (point-min)) (while (looking-at "From ") (replace-match "X-From-Line: ") -- 1.7.10.4