xemacs-beta: lisp/gnus/nnmail.el comparison

comparison lisp/gnus/nnmail.el @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91

author	cvs
date	Mon, 13 Aug 2007 08:49:20 +0200
parents	ac2d302a0011
children	8fc7fe29b841

comparison

equal deleted inserted replaced

-:ad457d5f7d04
+:0293115a14e9
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news, mail
 ;; This file is part of GNU Emacs.
 (require 'nnheader)
 (require 'timezone)
 (require 'message)
 (eval-when-compile (require 'cl))
+(require 'custom)
-(defvar nnmail-split-methods
+(defgroup gnus-mail nil
+"Mailreading.."
+:group 'gnus)
+(defcustom nnmail-split-methods
 '(("mail.misc" ""))
-"*Incoming mail will be split according to this variable.
+"Incoming mail will be split according to this variable.
 If you'd like, for instance, one mail group for mail from the
 \"4ad-l\" mailing list, one group for junk mail and one for everything
 else, you could do something like this:
 the argument.  It should return a non-nil value if it thinks that the
 mail belongs in that group.
 The last element should always have \"\" as the regexp.
-This variable can also have a function as its value.")
+This variable can also have a function as its value."
+:group 'gnus-mail
+:type '(choice (repeat :tag "Alist" (group (string :tag "Name") regexp))
+		 (function-item nnmail-split-fancy)
+		 (function :tag "Other")))
 ;; Suggested by Erik Selberg <speed@cs.washington.edu>.
-(defvar nnmail-crosspost t
+(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.")
+If nil, the first match found will be used."
+:group 'gnus-mail
+:type 'boolean)
 ;; Added by gord@enci.ucalgary.ca (Gordon Matzigkeit).
-(defvar nnmail-keep-last-article nil
+(defcustom nnmail-keep-last-article nil
-"*If non-nil, nnmail will never delete the last expired article in a directory.
+"If non-nil, nnmail will never delete the last expired article in a directory.
 You may need to set this variable if other programs are putting
-new mail into folder numbers that Gnus has marked as expired.")
+new mail into folder numbers that Gnus has marked as expired."
+:group 'gnus-mail
-(defvar nnmail-use-long-file-names nil
+:type 'boolean)
-"*If non-nil the mail backends will use long file and directory names.
+(defcustom nnmail-use-long-file-names nil
+"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/\".")
+\"mail/misc/\"."
+:group 'gnus-mail
-(defvar nnmail-expiry-wait 7
+:type 'boolean)
+(defcustom nnmail-default-file-modes 384
+"Set the mode bits of all new mail files to this integer."
+:group 'gnus-mail
+:type 'integer)
+(defcustom nnmail-expiry-wait 7
 "*Expirable articles that are older than this will be expired.
 This variable can either be a number (which will be interpreted as a
 number of days) -- this doesn't have to be an integer.  This variable
-can also be `immediate' and `never'.")
+can also be `immediate' and `never'."
+:group 'gnus-mail
-(defvar nnmail-expiry-wait-function nil
+:type '(choice (const immediate)
-"*Variable that holds function to specify how old articles should be before they are expired.
+		 (integer :tag "days")
+		 (const never)))
+(defcustom nnmail-expiry-wait-function nil
+"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
 \"old\".  It can also return the values `never' and `immediate'.
 Eg.:
-(setq nnmail-expiry-wait-function
+\(setq nnmail-expiry-wait-function
 (lambda (newsgroup)
 (cond ((string-match \"private\" newsgroup) 31)
 ((string-match \"junk\" newsgroup) 1)
 	      ((string-match \"important\" newsgroup) 'never)
-	      (t 7))))")
+	      (t 7))))"
+:group 'gnus-mail
-(defvar nnmail-spool-file
+:type '(choice (const :tag "nnmail-expiry-wait" nil)
+		 (function :format "%v" nnmail-)))
+(defcustom nnmail-spool-file
 (or (getenv "MAIL")
 (concat "/usr/spool/mail/" (user-login-name)))
 "Where the mail backends will look for incoming mail.
 This variable is \"/usr/spool/mail/$user\" by default.
 If this variable is nil, no mail backends will read incoming mail.
 If this variable is a list, all files mentioned in this list will be
-used as incoming mailboxes.")
+used as incoming mailboxes.
+If this variable is a directory (i. e., it's name ends with a \"/\"),
-(defvar nnmail-crash-box "~/.gnus-crash-box"
+treat all files in that directory as incoming spool files."
-"*File where Gnus will store mail while processing it.")
+:group 'gnus-mail
+:type 'file)
-(defvar nnmail-use-procmail nil
+(defcustom nnmail-crash-box "~/.gnus-crash-box"
+"File where Gnus will store mail while processing it."
+:group 'gnus-mail
+:type 'file)
+(defcustom nnmail-use-procmail nil
 "*If non-nil, the mail backends will look in `nnmail-procmail-directory' for spool files.
-The file(s) in `nnmail-spool-file' will also be read.")
+The file(s) in `nnmail-spool-file' will also be read."
+:group 'gnus-mail
-(defvar nnmail-procmail-directory "~/incoming/"
+:type 'boolean)
+(defcustom nnmail-procmail-directory "~/incoming/"
 "*When using procmail (and the like), incoming mail is put in this directory.
-The Gnus mail backends will read the mail from this directory.")
+The Gnus mail backends will read the mail from this directory."
+:group 'gnus-mail
-(defvar nnmail-procmail-suffix "\\.spool"
+:type 'directory)
+(defcustom nnmail-procmail-suffix "\\.spool"
 "*Suffix of files created by procmail (and the like).
 This variable might be a suffix-regexp to match the suffixes of
-several files - eg. \".spool[0-9]*\".")
+several files - eg. \".spool[0-9]*\"."
+:group 'gnus-mail
-(defvar nnmail-resplit-incoming nil
+:type 'regexp)
-"*If non-nil, re-split incoming procmail sorted mail.")
+(defcustom nnmail-resplit-incoming nil
-(defvar nnmail-delete-file-function 'delete-file
+"*If non-nil, re-split incoming procmail sorted mail."
-"Function called to delete files in some mail backends.")
+:group 'gnus-mail
+:type 'boolean)
-(defvar nnmail-crosspost-link-function 'add-name-to-file
+(defcustom nnmail-delete-file-function 'delete-file
+"Function called to delete files in some mail backends."
+:group 'gnus-mail
+:type 'function)
+(defcustom nnmail-crosspost-link-function 'add-name-to-file
 "Function called to create a copy of a file.
 This is `add-name-to-file' by default, which means that crossposts
 will use hard links.  If your file system doesn't allow hard
-links, you could set this variable to `copy-file' instead.")
+links, you could set this variable to `copy-file' instead."
+:group 'gnus-mail
-(defvar nnmail-movemail-program "movemail"
+:type '(radio (function-item add-name-to-file)
+		(function-item copy-file)
+		(function :tag "Other")))
+(defcustom nnmail-movemail-program "movemail"
 "*A command to be executed to move mail from the inbox.
-The default is \"movemail\".")
+The default is \"movemail\".
-(defvar nnmail-pop-password-required nil
+This can also be a function.  In that case, the function will be
-"*Non-nil if a password is required when reading mail using POP.")
+called with two parameters -- the name of the INBOX file, and the file
+to be moved to."
-(defvar nnmail-read-incoming-hook nil
+:group 'gnus-mail
-"*Hook that will be run after the incoming mail has been transferred.
+:type 'string)
+(defcustom nnmail-pop-password-required nil
+"*Non-nil if a password is required when reading mail using POP."
+:group 'gnus-mail
+:type 'boolean)
+(defcustom nnmail-read-incoming-hook
+(if (eq system-type 'windows-nt)
+'(nnheader-ms-strip-cr)
+nil)
+"Hook that will be run after the incoming mail has been transferred.
 The incoming mail is moved from `nnmail-spool-file' (which normally is
 something like \"/usr/spool/mail/$user\") to the user's home
-directory. This hook is called after the incoming mail box has been
+directory.  This hook is called after the incoming mail box has been
 emptied, and can be used to call any mail box programs you have
 running (\"xwatch\", etc.)
 Eg.
 \(add-hook 'nnmail-read-incoming-hook
 	   (lambda ()
 	     (start-process \"mailsend\" nil
 			    \"/local/bin/mailsend\" \"read\" \"mbox\")))
 If you have xwatch running, this will alert it that mail has been
 read.
 \(add-hook 'nnmail-read-incoming-hook
 	  (lambda ()
 	    ;; Update the displayed time, since that will clear out
 	    ;; the flag that says you have mail.
-	    (if (eq (process-status \"display-time\") 'run)
+	    (when (eq (process-status \"display-time\") 'run)
-		(display-time-filter display-time-process \"\"))))")
+	      (display-time-filter display-time-process \"\"))))"
+:group 'gnus-mail
-(when (eq system-type 'windows-nt)
+:type 'hook)
-(add-hook 'nnmail-prepare-incoming-hook 'nnheader-ms-strip-cr))
 ;; Suggested by Erik Selberg <speed@cs.washington.edu>.
-(defvar nnmail-prepare-incoming-hook nil
+(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.")
+The hook is run in a buffer with all the new, incoming mail."
+:group 'gnus-mail
-(defvar nnmail-pre-get-new-mail-hook nil
+:type 'hook)
-"Hook called just before starting to handle new incoming mail.")
+(defcustom nnmail-prepare-incoming-header-hook nil
-(defvar nnmail-post-get-new-mail-hook nil
+"Hook called narrowed to the headers of each message.
-"Hook called just after finishing handling new incoming mail.")
+This can be used to remove excessive spaces (and stuff like
+that) from the headers before splitting and saving the messages."
+:group 'gnus-mail
+:type 'hook)
+(defcustom nnmail-prepare-incoming-message-hook nil
+"Hook called narrowed to each message."
+:group 'gnus-mail
+:type 'hook)
+(defcustom nnmail-list-identifiers nil
+"Regexp that matches list identifiers to be removed.
+This can also be a list of regexps."
+:group 'gnus-mail
+:type '(choice regexp
+		 (repeat regexp)))
+(defcustom nnmail-pre-get-new-mail-hook nil
+"Hook called just before starting to handle new incoming mail."
+:group 'gnus-mail
+:type 'hook)
+(defcustom nnmail-post-get-new-mail-hook nil
+"Hook called just after finishing handling new incoming mail."
+:group 'gnus-mail
+:type 'hook)
+(defcustom nnmail-split-hook nil
+"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."
+:group 'gnus-mail
+:type 'hook)
 ;; Suggested by Mejia Pablo J <pjm9806@usl.edu>.
-(defvar nnmail-tmp-directory nil
+(defcustom nnmail-tmp-directory nil
-"*If non-nil, use this directory for temporary storage when reading incoming mail.")
+"*If non-nil, use this directory for temporary storage when reading incoming mail."
+:group 'gnus-mail
-(defvar nnmail-large-newsgroup 50
+:type '(choice (const :tag "default" nil)
+		 (directory :format "%v")))
+(defcustom nnmail-large-newsgroup 50
 "*The number of the articles which indicates a large newsgroup.
 If the number of the articles is greater than the value, verbose
-messages will be shown to indicate the current status.")
+messages will be shown to indicate the current status."
+:group 'gnus-mail
-(defvar nnmail-split-fancy "mail.misc"
+:type 'integer)
-"*Incoming mail can be split according to this fancy variable.
+(defcustom nnmail-split-fancy "mail.misc"
+"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
 the following:
 GROUP: Mail will be stored in GROUP (a string).
 \(FIELD VALUE SPLIT): If the message field FIELD (a regexp) contains
 VALUE (a regexp), store the messages as specified by SPLIT.
 \(| SPLIT...): Process each SPLIT expression until one of them matches.
 A SPLIT expression is said to match if it will cause the mail
 message to be stored in one or more groups.
 \(& SPLIT...): Process each SPLIT expression.
+\(: FUNCTION optional args): Call FUNCTION with the optional args, in
+the buffer containing the message headers.  The return value FUNCTION
+should be a split, which is then recursively processed.
 FIELD must match a complete field name.  VALUE must match a complete
 word according to the `nnmail-split-fancy-syntax-table' syntax table.
 You can use .* in the regexps to match partial field names or words.
 FIELD and VALUE can also be lisp symbols, in that case they are expanded
 as specified in `nnmail-split-abbrev-alist'.
+GROUP can contain \\& and \\N which will substitute from matching
+\\(\\) patterns in the previous VALUE.
 Example:
 \(setq nnmail-split-methods 'nnmail-split-fancy
 nnmail-split-fancy
-;; Messages from the mailer deamon are not crossposted to any of
+;; Messages from the mailer daemon are not crossposted to any of
 ;; the ordinary groups.  Warnings are put in a separate group
 ;; from real errors.
 '(| (\"from\" mail (| (\"subject\" \"warn.*\" \"mail.warning\")
 			  \"mail.misc\"))
 	  ;; Non-error messages are crossposted to all relevant
 	     (any \"procmail@informatik\\\\.rwth-aachen\\\\.de\" \"procmail.list\")
 	     (any \"SmartList@informatik\\\\.rwth-aachen\\\\.de\" \"SmartList.list\")
 	     ;; People...
 	     (any \"larsi@ifi\\\\.uio\\\\.no\" \"people.Lars Magne Ingebrigtsen\"))
 	  ;; Unmatched mail goes to the catch all group.
-	  \"misc.misc\"))")
+	  \"misc.misc\"))"
+:group 'gnus-mail
-(defvar nnmail-split-abbrev-alist
+;; Sigh!
+:type 'sexp)
+(defcustom nnmail-split-abbrev-alist
 '((any . "from\\|to\\|cc\\|sender\\|apparently-to\\|resent-from\\|resent-to\\|resent-cc")
-(mail . "mailer-daemon\\|postmaster"))
+(mail . "mailer-daemon\\|postmaster\\|uucp"))
-"*Alist of abbreviations allowed in `nnmail-split-fancy'.")
+"Alist of abbreviations allowed in `nnmail-split-fancy'."
+:group 'gnus-mail
-(defvar nnmail-delete-incoming t
+:type '(repeat (cons :format "%v" symbol regexp)))
-"*If non-nil, the mail backends will delete incoming files after splitting.")
+(defcustom nnmail-delete-incoming t
-(defvar nnmail-message-id-cache-length 1000
+"*If non-nil, the mail backends will delete incoming files after
+splitting."
+:group 'gnus-mail
+:type 'boolean)
+(defcustom nnmail-message-id-cache-length 1000
 "*The approximate number of Message-IDs nnmail will keep in its cache.
 If this variable is nil, no checking on duplicate messages will be
-performed.")
+performed."
+:group 'gnus-mail
-(defvar nnmail-message-id-cache-file "~/.nnmail-cache"
+:type '(choice (const :tag "disable" nil)
-"*The file name of the nnmail Message-ID cache.")
+		 (integer :format "%v")))
-(defvar nnmail-treat-duplicates 'warn
+(defcustom nnmail-message-id-cache-file "~/.nnmail-cache"
+"*The file name of the nnmail Message-ID cache."
+:group 'gnus-mail
+:type 'file)
+(defcustom nnmail-treat-duplicates 'warn
 "*If non-nil, nnmail keep a cache of Message-IDs to discover mail duplicates.
 Three values are legal: nil, which means that nnmail is not to keep a
 Message-ID cache; `warn', which means that nnmail should insert extra
 headers to warn the user about the duplication (this is the default);
 and `delete', which means that nnmail will delete duplicated mails.
 This variable can also be a function.  It will be called from a buffer
 narrowed to the article in question with the Message-ID as a
-parameter.  It should return nil, `warn' or `delete'.")
+parameter.  It should return nil, `warn' or `delete'."
+:group 'gnus-mail
+:type '(choice (const :tag "off" nil)
+		 (const warn)
+		 (const delete)))
 ;;; Internal variables.
+(defvar nnmail-split-history nil
+"List of group/article elements that say where the previous split put messages.")
 (defvar nnmail-pop-password nil
 "*Password to use when reading mail from a POP server, if required.")
 (defvar nnmail-split-fancy-syntax-table nil
 (unless (syntax-table-p nnmail-split-fancy-syntax-table)
 (setq nnmail-split-fancy-syntax-table
 	(copy-syntax-table (standard-syntax-table)))
 ;; support the %-hack
 (modify-syntax-entry ?\% "." nnmail-split-fancy-syntax-table))
 (defvar nnmail-prepare-save-mail-hook nil
 "Hook called before saving mail.")
 (defvar nnmail-moved-inboxes nil
 	     (file-directory-p (concat dir group)))
 	 (concat dir group "/")
 ;; If not, we translate dots into slashes.
 (concat dir (nnheader-replace-chars-in-string group ?. ?/) "/")))
 (or file "")))
 (defun nnmail-date-to-time (date)
 "Convert DATE into time."
-(let* ((d1 (timezone-parse-date date))
+(condition-case ()
-	 (t1 (timezone-parse-time (aref d1 3))))
+(let* ((d1 (timezone-parse-date date))
-(apply 'encode-time
+	     (t1 (timezone-parse-time (aref d1 3))))
-	   (mapcar (lambda (el)
+	(apply 'encode-time
-		     (and el (string-to-number el)))
+	       (mapcar (lambda (el)
-		   (list
+			 (and el (string-to-number el)))
-		    (aref t1 2) (aref t1 1) (aref t1 0)
+		       (list
-		    (aref d1 2) (aref d1 1) (aref d1 0)
+			(aref t1 2) (aref t1 1) (aref t1 0)
-		    (aref d1 4))))))
+			(aref d1 2) (aref d1 1) (aref d1 0)
+			(number-to-string
+			 (* 60 (timezone-zone-to-minute (aref d1 4))))))))
+;; If we get an error, then we just return a 0 time.
+(error (list 0 0))))
 (defun nnmail-time-less (t1 t2)
 "Say whether time T1 is less than time T2."
 (or (< (car t1) (car t2))
 (and (= (car t1) (car t2))
 (defun nnmail-days-to-time (days)
 "Convert DAYS into time."
 (let* ((seconds (* 1.0 days 60 60 24))
 	 (rest (expt 2 16))
 	 (ms (condition-case nil (round (/ seconds rest))
 	       (range-error (expt 2 16)))))
 (list ms (condition-case nil (round (- seconds (* ms rest)))
 	       (range-error (expt 2 16))))))
 (defun nnmail-time-since (time)
 "Return the time since TIME, which is either an internal time or a date."
 (when (stringp time)
 ;; Convert date strings to internal time.
 (setq time (nnmail-date-to-time time)))
 (let* ((current (current-time))
-	 (rest (if (< (nth 1 current) (nth 1 time)) (expt 2 16))))
+	 (rest (when (< (nth 1 current) (nth 1 time))
+		 (expt 2 16))))
 (list (- (+ (car current) (if rest -1 0)) (car time))
 	  (- (+ (or rest 0) (nth 1 current)) (nth 1 time)))))
 ;; Function rewritten from rmail.el.
 (defun nnmail-move-inbox (inbox)
 "Move INBOX to `nnmail-crash-box'."
-(let ((inbox (file-truename (expand-file-name inbox)))
+(if (not (file-writable-p nnmail-crash-box))
-	(tofile (file-truename (expand-file-name nnmail-crash-box)))
+(gnus-error 1 "Can't write to crash box %s.  Not moving mail."
-	movemail popmail errors password)
+		  nnmail-crash-box)
-;; If getting from mail spool directory,
+;; If the crash box exists and is empty, we delete it.
-;; use movemail to move rather than just renaming,
+(when (and (file-exists-p nnmail-crash-box)
-;; so as to interlock with the mailer.
+	       (zerop (nnheader-file-size (file-truename nnmail-crash-box))))
-(unless (setq popmail (string-match "^po:" (file-name-nondirectory inbox)))
+(delete-file nnmail-crash-box))
-(setq movemail t))
+(let ((inbox (file-truename (expand-file-name inbox)))
-(when popmail
+	  (tofile (file-truename (expand-file-name nnmail-crash-box)))
-(setq inbox (file-name-nondirectory inbox)))
+	  movemail popmail errors)
-(when (and movemail
+(if (setq popmail (string-match
-	       ;; On some systems, /usr/spool/mail/foo is a directory
+			 "^po:" (file-name-nondirectory inbox)))
-	       ;; and the actual inbox is /usr/spool/mail/foo/foo.
+	  (setq inbox (file-name-nondirectory inbox))
-	       (file-directory-p inbox))
+	(setq movemail t)
-(setq inbox (expand-file-name (user-login-name) inbox)))
+	;; On some systems, /usr/spool/mail/foo is a directory
-(if (member inbox nnmail-moved-inboxes)
+	;; and the actual inbox is /usr/spool/mail/foo/foo.
-	nil
+	(when (file-directory-p inbox)
-(if popmail
+	  (setq inbox (expand-file-name (user-login-name) inbox))))
-	  (progn
+(if (member inbox nnmail-moved-inboxes)
-	    (setq nnmail-internal-password nnmail-pop-password)
+	  ;; We don't try to move an already moved inbox.
-	    (when (and nnmail-pop-password-required (not nnmail-pop-password))
+	  nil
-	      (setq nnmail-internal-password
+	(if popmail
-		    (nnmail-read-passwd
+	    (progn
-		     (format "Password for %s: "
+	      (when (and nnmail-pop-password
-			     (substring inbox (+ popmail 3))))))
+			 (not nnmail-internal-password))
-	    (message "Getting mail from post office ..."))
+		(setq nnmail-internal-password nnmail-pop-password))
-	(when (or (and (file-exists-p tofile)
+	      (when (and nnmail-pop-password-required
-		       (/= 0 (nnheader-file-size tofile)))
+			 (not nnmail-internal-password))
-		  (and (file-exists-p inbox)
+		(setq nnmail-internal-password
-		       (/= 0 (nnheader-file-size inbox))))
+		      (nnmail-read-passwd
-	  (message "Getting mail from %s..." inbox)))
+		       (format "Password for %s: "
-;; Set TOFILE if have not already done so, and
+			       (substring inbox (+ popmail 3))))))
-;; rename or copy the file INBOX to TOFILE if and as appropriate.
+	      (message "Getting mail from post office ..."))
-(cond
+	  (when (or (and (file-exists-p tofile)
-((file-exists-p tofile)
+			 (/= 0 (nnheader-file-size tofile)))
-	;; The crash box exists already.
+		    (and (file-exists-p inbox)
-	t)
+			 (/= 0 (nnheader-file-size inbox))))
-((and (not popmail)
+	    (message "Getting mail from %s..." inbox)))
-	     (not (file-exists-p inbox)))
+	;; Set TOFILE if have not already done so, and
-	;; There is no inbox.
+	;; rename or copy the file INBOX to TOFILE if and as appropriate.
-	(setq tofile nil))
+	(cond
-((and (not movemail) (not popmail))
+	 ((file-exists-p tofile)
-	;; Try copying.  If that fails (perhaps no space),
+	  ;; The crash box exists already.
-	;; rename instead.
+	  t)
-	(condition-case nil
+	 ((and (not popmail)
-	    (copy-file inbox tofile nil)
+	       (not (file-exists-p inbox)))
-	  (error
+	  ;; There is no inbox.
-	   ;; Third arg is t so we can replace existing file TOFILE.
+	  (setq tofile nil))
-	   (rename-file inbox tofile t)))
+	 (t
-	(push inbox nnmail-moved-inboxes)
+	  ;; If getting from mail spool directory, use movemail to move
-	;; Make the real inbox file empty.
+	  ;; rather than just renaming, so as to interlock with the
-	;; Leaving it deleted could cause lossage
+	  ;; mailer.
-	;; because mailers often won't create the file.
+	  (unwind-protect
-	(condition-case ()
+	      (save-excursion
-	    (write-region (point) (point) inbox)
+		(setq errors (generate-new-buffer " *nnmail loss*"))
-	  (file-error nil)))
+		(buffer-disable-undo errors)
-(t
+		(let ((default-directory "/"))
-	;; Use movemail.
+		  (if (nnheader-functionp nnmail-movemail-program)
-	(unwind-protect
+		      (funcall nnmail-movemail-program inbox tofile)
-	    (save-excursion
+		    (apply
-	      (setq errors (generate-new-buffer " *nnmail loss*"))
+		     'call-process
-	      (buffer-disable-undo errors)
+		     (append
-	      (let ((default-directory "/"))
+		      (list
-		(apply
+		       (expand-file-name
-		 'call-process
+			nnmail-movemail-program exec-directory)
-		 (append
+		       nil errors nil inbox tofile)
-		  (list
+		      (when nnmail-internal-password
-		   (expand-file-name nnmail-movemail-program exec-directory)
+			(list nnmail-internal-password))))))
-		   nil errors nil inbox tofile)
+		(if (not (buffer-modified-p errors))
-		  (when nnmail-internal-password
+		    ;; No output => movemail won
-		    (list nnmail-internal-password)))))
+		    (progn
-	      (if (not (buffer-modified-p errors))
+		      (unless popmail
-		  ;; No output => movemail won
+			(set-file-modes tofile nnmail-default-file-modes))
-		  (push inbox nnmail-moved-inboxes)
+		      (push inbox nnmail-moved-inboxes))
-		(set-buffer errors)
+		  (set-buffer errors)
-		(subst-char-in-region (point-min) (point-max) ?\n ?\  )
+		  ;; There may be a warning about older revisions.  We
-		(goto-char (point-max))
+		  ;; ignore those.
-		(skip-chars-backward " \t")
+		  (goto-char (point-min))
-		(delete-region (point) (point-max))
+		  (if (search-forward "older revision" nil t)
-		(goto-char (point-min))
+		      (progn
-		(if (looking-at "movemail: ")
+			(unless popmail
-		    (delete-region (point-min) (match-end 0)))
+			  (set-file-modes tofile nnmail-default-file-modes))
-		(error (concat "movemail: " (buffer-string)))
+			(push inbox nnmail-moved-inboxes))
-		(setq tofile nil))))))
+		    ;; Probably a real error.
-(and errors
+		    (subst-char-in-region (point-min) (point-max) ?\n ?\  )
-	   (buffer-name errors)
+		    (goto-char (point-max))
-	   (kill-buffer errors))
+		    (skip-chars-backward " \t")
-tofile)))
+		    (delete-region (point) (point-max))
+		    (goto-char (point-min))
+		    (when (looking-at "movemail: ")
+		      (delete-region (point-min) (match-end 0)))
+		    (unless (yes-or-no-p
+			     (format "movemail: %s.  Continue? "
+				     (buffer-string)))
+		      (error "%s" (buffer-string)))
+		    (setq tofile nil)))))))
+	(message "Getting mail from %s...done" inbox)
+	(and errors
+	     (buffer-name errors)
+	     (kill-buffer errors))
+	tofile))))
 (defun nnmail-get-active ()
 "Returns an assoc of group names and active ranges.
 nn*-request-list should have been called before calling this function."
 (let (group-assoc)
 group-assoc))
 (defun nnmail-save-active (group-assoc file-name)
 "Save GROUP-ASSOC in ACTIVE-FILE."
 (when file-name
-(let (group)
+(nnheader-temp-write file-name
-(save-excursion
+(nnmail-generate-active group-assoc))))
-	(set-buffer (get-buffer-create " *nnmail active*"))
-	(buffer-disable-undo (current-buffer))
+(defun nnmail-generate-active (alist)
-	(erase-buffer)
+"Generate an active file from group-alist ALIST."
-	(while group-assoc
+(erase-buffer)
-	  (setq group (pop group-assoc))
+(let (group)
-	  (insert (format "%s %d %d y\n" (car group) (cdadr group)
+(while (setq group (pop alist))
-			  (caadr group))))
+(insert (format "%s %d %d y\n" (car group) (cdadr group)
-	(unless (file-exists-p (file-name-directory file-name))
+		      (caadr group))))))
-	  (make-directory (file-name-directory file-name) t))
-	(write-region 1 (point-max) (expand-file-name file-name) nil 'nomesg)
-	(kill-buffer (current-buffer))))))
 (defun nnmail-get-split-group (file group)
+"Find out whether this FILE is to be split into GROUP only.
+If GROUP is non-nil and we are using procmail, return the group name
+only when the file is the correct procmail file.  When GROUP is nil,
+return nil if FILE is a spool file or the procmail group for which it
+is a spool.  If not using procmail, return GROUP."
 (if (or (eq nnmail-spool-file 'procmail)
 	  nnmail-use-procmail)
-(cond (group group)
+(if (string-match (concat "^" (expand-file-name
-	    ((string-match (concat "^" (expand-file-name
+				     (file-name-as-directory
-					(file-name-as-directory
+				      nnmail-procmail-directory))
-					 nnmail-procmail-directory))
+				"\\([^/]*\\)" nnmail-procmail-suffix "$")
-				   "\\([^/]*\\)" nnmail-procmail-suffix "$")
+			(expand-file-name file))
-			   (expand-file-name file))
+	  (let ((procmail-group (substring (expand-file-name file)
-	     (substring (expand-file-name file)
+					   (match-beginning 1)
-			(match-beginning 1) (match-end 1)))
+					   (match-end 1))))
-	    (t
+	    (if group
-	     group))
+		(if (string-equal group procmail-group)
+		    group
+		  nil)
+	      procmail-group))
+	nil)
 group))
-(defun nnmail-process-babyl-mail-format (func)
+(defun nnmail-process-babyl-mail-format (func artnum-func)
 (let ((case-fold-search t)
 	start message-id content-length do-search end)
+(goto-char (point-min))
 (while (not (eobp))
-(goto-char (point-min))
 (re-search-forward
 "\n0, *unseen,+\n\\(\\*\\*\\* EOOH \\*\\*\\*\n\\)?" nil t)
 (goto-char (match-end 0))
 (delete-region (match-beginning 0) (match-end 0))
-(setq start (point))
+(narrow-to-region
-;; Skip all the headers in case there are more "From "s...
+(setq start (point))
-(or (search-forward "\n\n" nil t)
+(progn
-	  (search-forward-regexp "^[^:]*\\( .*\\|\\)$" nil t)
+	 ;; Skip all the headers in case there are more "From "s...
-	  (search-forward ""))
+	 (or (search-forward "\n\n" nil t)
+	     (search-forward-regexp "^[^:]*\\( .*\\|\\)$" nil t)
+	     (search-forward ""))
+	 (point)))
+;; Unquote the ">From " line, if any.
+(goto-char (point-min))
+(when (looking-at ">From ")
+	(replace-match "X-From-Line: ") )
+(run-hooks 'nnmail-prepare-incoming-header-hook)
+(goto-char (point-max))
 ;; Find the Message-ID header.
 (save-excursion
 	(if (re-search-backward "^Message-ID:[ \t]*\\(<[^>]*>\\)" nil t)
 	    (setq message-id (buffer-substring (match-beginning 1)
 					       (match-end 1)))
 		      ;; the backends ever use it, and we do not
 		      ;; want to confuse other mailers by having
 		      ;; a (possibly) faulty header.
 		      (progn (insert "X-") t))))
 	  (setq do-search t)
+	(widen)
 	(if (or (= (+ (point) content-length) (point-max))
 		(save-excursion
 		  (goto-char (+ (point) content-length))
 		  (looking-at "")))
 	    (progn
 	      (goto-char (+ (point) content-length))
 	      (setq do-search nil))
 	  (setq do-search t)))
+(widen)
 ;; Go to the beginning of the next article - or to the end
 ;; of the buffer.
-(if do-search
+(when do-search
-	  (if (re-search-forward "^" nil t)
+	(if (re-search-forward "^" nil t)
-	      (goto-char (match-beginning 0))
+	    (goto-char (match-beginning 0))
-	    (goto-char (1- (point-max)))))
+	  (goto-char (1- (point-max)))))
 (delete-char 1)			; delete ^_
 (save-excursion
 	(save-restriction
 	  (narrow-to-region start (point))
 	  (goto-char (point-min))
-	  (nnmail-check-duplication message-id func)
+	  (nnmail-check-duplication message-id func artnum-func)
 	  (setq end (point-max))))
 (goto-char end))))
 (defun nnmail-search-unix-mail-delim ()
-"Put point at the beginning of the next message."
+"Put point at the beginning of the next Unix mbox message."
-(let ((case-fold-search t)
+;; Algorithm used to find the the next article in the
-	(delim (concat "^" message-unix-mail-delimiter))
+;; brain-dead Unix mbox format:
+;;
+;; 1) Search for "^From ".
+;; 2) If we find it, then see whether the previous
+;;    line is blank and the next line looks like a header.
+;; Then it's possible that this is a mail delim, and we use it.
+(let ((case-fold-search nil)
 	found)
 (while (not found)
-(if (re-search-forward delim nil t)
+(if (not (re-search-forward "^From " nil t))
-	  (when (or (looking-at "[^\n :]+ *:")
+	  (setq found 'no)
-		    (looking-at delim)
+	(save-excursion
-		    (looking-at (concat ">" message-unix-mail-delimiter)))
+	  (beginning-of-line)
-	    (forward-line -1)
+	  (when (and (or (bobp)
-	    (setq found 'yes))
+			 (save-excursion
-	(setq found 'no)))
+			   (forward-line -1)
+			   (= (following-char) ?\n)))
+		     (save-excursion
+		       (forward-line 1)
+		       (while (looking-at ">From ")
+			 (forward-line 1))
+		       (looking-at "[^ \t:]+[ \t]*:")))
+	    (setq found 'yes)))))
+(beginning-of-line)
 (eq found 'yes)))
-(defun nnmail-process-unix-mail-format (func)
+(defun nnmail-search-unix-mail-delim-backward ()
+"Put point at the beginning of the current Unix mbox message."
+;; Algorithm used to find the the next article in the
+;; brain-dead Unix mbox format:
+;;
+;; 1) Search for "^From ".
+;; 2) If we find it, then see whether the previous
+;;    line is blank and the next line looks like a header.
+;; Then it's possible that this is a mail delim, and we use it.
+(let ((case-fold-search nil)
+	found)
+(while (not found)
+(if (not (re-search-backward "^From " nil t))
+	  (setq found 'no)
+	(save-excursion
+	  (beginning-of-line)
+	  (when (and (or (bobp)
+			 (save-excursion
+			   (forward-line -1)
+			   (= (following-char) ?\n)))
+		     (save-excursion
+		       (forward-line 1)
+		       (while (looking-at ">From ")
+			 (forward-line 1))
+		       (looking-at "[^ \t:]+[ \t]*:")))
+	    (setq found 'yes)))))
+(beginning-of-line)
+(eq found 'yes)))
+(defun nnmail-process-unix-mail-format (func artnum-func)
 (let ((case-fold-search t)
-	(delim (concat "^" message-unix-mail-delimiter))
 	start message-id content-length end skip head-end)
 (goto-char (point-min))
-(if (not (and (re-search-forward delim nil t)
+(if (not (and (re-search-forward "^From " nil t)
 		  (goto-char (match-beginning 0))))
 	;; Possibly wrong format?
 	(error "Error, unknown mail format! (Possibly corrupted.)")
 ;; Carry on until the bitter end.
 (while (not (eobp))
 	  ;; We destroy the header, since none of the backends ever
 	  ;; use it, and we do not want to confuse other mailers by
 	  ;; having a (possibly) faulty header.
 	  (beginning-of-line)
 	  (insert "X-"))
+	(run-hooks 'nnmail-prepare-incoming-header-hook)
 	;; Find the end of this article.
 	(goto-char (point-max))
 	(widen)
 	(setq head-end (point))
 	;; We try the Content-Length value.  The idea: skip over the header
 	  (setq skip (+ (point) content-length))
 	  (goto-char skip)
 	  (cond ((or (= skip (point-max))
 		     (= (1+ skip) (point-max)))
 		 (setq end (point-max)))
-		((looking-at delim)
+		((looking-at "From ")
 		 (setq end skip))
-		((looking-at
+		((looking-at "[ \t]*\n\\(From \\)")
-		  (concat "[ \t]*\n\\(" delim "\\)"))
 		 (setq end (match-beginning 1)))
 		(t (setq end nil))))
 	(if end
 	    (goto-char end)
 	  ;; No Content-Length, so we find the beginning of the next
 	;; Allow the backend to save the article.
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region start (point))
 	    (goto-char (point-min))
-	    (nnmail-check-duplication message-id func)
+	    (nnmail-check-duplication message-id func artnum-func)
 	    (setq end (point-max))))
 	(goto-char end)))))
-(defun nnmail-process-mmdf-mail-format (func)
+(defun nnmail-process-mmdf-mail-format (func artnum-func)
 (let ((delim "^\^A\^A\^A\^A$")
 	(case-fold-search t)
 	start message-id end)
 (goto-char (point-min))
 (if (not (and (re-search-forward delim nil t)
 	    (when (re-search-backward "^Message-ID:" nil t)
 	      (beginning-of-line)
 	      (insert "Original-")))
 	  (forward-line 1)
 	  (insert "Message-ID: " (setq message-id (nnmail-message-id)) "\n"))
+	(run-hooks 'nnmail-prepare-incoming-header-hook)
 	;; Find the end of this article.
 	(goto-char (point-max))
 	(widen)
 	(if (re-search-forward delim nil t)
 	    (beginning-of-line)
 	;; Allow the backend to save the article.
 	(save-excursion
 	  (save-restriction
 	    (narrow-to-region start (point))
 	    (goto-char (point-min))
-	    (nnmail-check-duplication message-id func)
+	    (nnmail-check-duplication message-id func artnum-func)
 	    (setq end (point-max))))
 	(goto-char end)
 	(forward-line 2)))))
-(defun nnmail-split-incoming (incoming func &optional exit-func group)
+(defun nnmail-split-incoming (incoming func &optional exit-func
+				       group artnum-func)
 "Go through the entire INCOMING file and pick out each individual mail.
 FUNC will be called with the buffer narrowed to each mail."
 (let (;; If this is a group-specific split, we bind the split
 	;; methods to just this group.
 	(nnmail-split-methods (if (and group
 (save-excursion
 ;; Insert the incoming file.
 (set-buffer (get-buffer-create " *nnmail incoming*"))
 (buffer-disable-undo (current-buffer))
 (erase-buffer)
-(nnheader-insert-file-contents-literally incoming)
+(nnheader-insert-file-contents incoming)
 (unless (zerop (buffer-size))
 	(goto-char (point-min))
 	(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
 	;; fetches from a file.
 	(cond ((or (looking-at "\^L")
 		   (looking-at "BABYL OPTIONS:"))
-	       (nnmail-process-babyl-mail-format func))
+	       (nnmail-process-babyl-mail-format func artnum-func))
 	      ((looking-at "\^A\^A\^A\^A")
-	       (nnmail-process-mmdf-mail-format func))
+	       (nnmail-process-mmdf-mail-format func artnum-func))
 	      (t
-	       (nnmail-process-unix-mail-format func))))
+	       (nnmail-process-unix-mail-format func artnum-func))))
-(if exit-func (funcall exit-func))
+(when exit-func
+	(funcall exit-func))
 (kill-buffer (current-buffer)))))
 ;; Mail crossposts suggested by Brian Edmonds <edmonds@cs.ubc.ca>.
 (defun nnmail-article-group (func)
 "Look at the headers and return an alist of groups that match.
 	(insert-buffer-substring obuf beg end)
 	;; Fold continuation lines.
 	(goto-char (point-min))
 	(while (re-search-forward "\\(\r?\n[ \t]+\\)+" nil t)
 	  (replace-match " " t t))
+	;; Allow washing.
+	(run-hooks 'nnmail-split-hook)
 	(if (and (symbolp nnmail-split-methods)
 		 (fboundp nnmail-split-methods))
-	    ;; `nnmail-split-methods' is a function, so we just call
+	    (let ((split
-	    ;; this function here and use the result.
-	    (setq group-art
-		  (mapcar
-		   (lambda (group) (cons group (funcall func group)))
 		   (condition-case nil
 		       (or (funcall nnmail-split-methods)
 			   '("bogus"))
 		     (error
 		      (message
 		       "Error in `nnmail-split-methods'; using `bogus' mail group")
 		      (sit-for 1)
 		      '("bogus")))))
+	      (unless (equal split '(junk))
+		;; `nnmail-split-methods' is a function, so we just call
+		;; this function here and use the result.
+		(setq group-art
+		      (mapcar
+		       (lambda (group) (cons group (funcall func group)))
+		       split))))
 	  ;; Go through the split methods to find a match.
 	  (while (and methods (or nnmail-crosspost (not group-art)))
 	    (goto-char (point-max))
 	    (setq method (pop methods))
 	    (if (or methods
 		    (not (equal "" (nth 1 method))))
 		(when (and
-		       (condition-case ()
+		       (ignore-errors
-			   (if (stringp (nth 1 method))
+			 (if (stringp (nth 1 method))
-			       (re-search-backward (cadr method) nil t)
+			     (re-search-backward (cadr method) nil t)
-			     ;; Function to say whether this is a match.
+			   ;; Function to say whether this is a match.
-			     (funcall (nth 1 method) (car method)))
+			   (funcall (nth 1 method) (car method))))
-			 (error nil))
 		       ;; Don't enter the article into the same
 		       ;; group twice.
 		       (not (assoc (car method) group-art)))
 		  (push (cons (car method) (funcall func (car method)))
 			group-art))
 	      ;; This is the final group, which is used as a
 	      ;; catch-all.
 	      (unless group-art
 		(setq group-art
 		      (list (cons (car method)
 				  (funcall func (car method)))))))))
-	group-art))))
+	;; See whether the split methods returned `junk'.
+	(if (equal group-art '(junk))
+	    nil
+	  (nreverse (delq 'junk group-art)))))))
 (defun nnmail-insert-lines ()
 "Insert how many lines there are in the body of the mail.
 Return the number of characters in the body."
 (let (lines chars)
 (save-excursion
 (goto-char (point-min))
 (when (search-forward "\n\n" nil t)
 	(setq chars (- (point-max) (point)))
 	(setq lines (count-lines (point) (point-max)))
 	(forward-char -1)
 	(save-excursion
 	  (when (re-search-backward "^Lines: " nil t)
 (defun nnmail-insert-xref (group-alist)
 "Insert an Xref line based on the (group . article) alist."
 (save-excursion
 (goto-char (point-min))
 (when (search-forward "\n\n" nil t)
 (forward-char -1)
 (when (re-search-backward "^Xref: " nil t)
 	(delete-region (match-beginning 0)
 		       (progn (forward-line 1) (point))))
 (insert (format "Xref: %s" (system-name)))
 (while group-alist
 	(insert (format " %s:%d" (caar group-alist) (cdar group-alist)))
 	(setq group-alist (cdr group-alist)))
 (insert "\n"))))
+;;; Message washing functions
+(defun nnmail-remove-leading-whitespace ()
+"Remove excessive whitespace from all headers."
+(goto-char (point-min))
+(while (re-search-forward "^\\([^ :]+: \\) +" nil t)
+(replace-match "\\1" t)))
+(defun nnmail-remove-list-identifiers ()
+"Remove list identifiers from Subject headers."
+(let ((regexp (if (stringp nnmail-list-identifiers) nnmail-list-identifiers
+		  (mapconcat 'identity nnmail-list-identifiers "\\|"))))
+(when regexp
+(goto-char (point-min))
+(when (re-search-forward
+	     (concat "^Subject: +\\(Re: +\\)?\\(" regexp "\\) *")
+	     nil t)
+	(delete-region (match-beginning 2) (match-end 0))))))
+(defun nnmail-remove-tabs ()
+"Translate TAB characters into SPACE characters."
+(subst-char-in-region (point-min) (point-max) ?\t ?  t))
+;;; Utility functions
 ;; Written by byer@mv.us.adobe.com (Scott Byer).
 (defun nnmail-make-complex-temp-name (prefix)
 (let ((newname (make-temp-name prefix))
 	(newprefix prefix))
 (defvar nnmail-split-cache nil)
 ;; Alist of split expressions their equivalent regexps.
 (defun nnmail-split-it (split)
 ;; Return a list of groups matching SPLIT.
-(cond ((stringp split)
+(cond
-	 ;; A group.
+;; nil split
-	 (list split))
+((null split)
-	((eq (car split) '&)
+nil)
-	 (apply 'nconc (mapcar 'nnmail-split-it (cdr split))))
-	((eq (car split) '|)
+;; A group name.  Do the \& and \N subs into the string.
-	 (let (done)
+((stringp split)
-	   (while (and (not done) (cdr split))
+(list (nnmail-expand-newtext split)))
-	     (setq split (cdr split)
-		   done (nnmail-split-it (car split))))
+;; Junk the message.
-	   done))
+((eq split 'junk)
-	((assq split nnmail-split-cache)
+(list 'junk))
-	 ;; A compiled match expression.
-	 (goto-char (point-max))
+;; Builtin & operation.
-	 (if (re-search-backward (cdr (assq split nnmail-split-cache)) nil t)
+((eq (car split) '&)
-	     (nnmail-split-it (nth 2 split))))
+(apply 'nconc (mapcar 'nnmail-split-it (cdr split))))
-	(t
-	 ;; An uncompiled match.
+;; Builtin | operation.
-	 (let* ((field (nth 0 split))
+((eq (car split) '|)
-		(value (nth 1 split))
+(let (done)
-		(regexp (concat "^\\("
+(while (and (not done) (cdr split))
-				(if (symbolp field)
+	(setq split (cdr split)
-				    (cdr (assq field
+	      done (nnmail-split-it (car split))))
-					       nnmail-split-abbrev-alist))
+done))
-				  field)
-				"\\):.*\\<\\("
+;; Builtin : operation.
-				(if (symbolp value)
+((eq (car split) ':)
-				    (cdr (assq value
+(nnmail-split-it (eval (cdr split))))
-					       nnmail-split-abbrev-alist))
-				  value)
+;; Check the cache for the regexp for this split.
-				"\\)\\>")))
+;; FIX FIX FIX could avoid calling assq twice here
-	   (setq nnmail-split-cache
+((assq split nnmail-split-cache)
-		 (cons (cons split regexp) nnmail-split-cache))
+(goto-char (point-max))
-	   (goto-char (point-max))
+;; FIX FIX FIX problem with re-search-backward is that if you have
-	   (if (re-search-backward regexp nil t)
+;; a split: (from "foo-\\(bar\\|baz\\)@gnus.org "mail.foo.\\1")
-	       (nnmail-split-it (nth 2 split)))))))
+;; and someone mails a message with 'To: foo-bar@gnus.org' and
+;; 'CC: foo-baz@gnus.org', we'll pick 'mail.foo.baz' as the group
+;; if the cc line is a later header, even though the other choice
+;; is probably better.  Also, this routine won't do a crosspost
+;; when there are two different matches.
+;; I guess you could just make this more determined, and it could
+;; look for still more matches prior to this one, and recurse
+;; on each of the multiple matches hit.  Of course, then you'd
+;; want to make sure that nnmail-article-group or nnmail-split-fancy
+;; removed duplicates, since there might be more of those.
+;; I guess we could also remove duplicates in the & split case, since
+;; that's the only thing that can introduce them.
+(when (re-search-backward (cdr (assq split nnmail-split-cache)) nil t)
+;; Someone might want to do a \N sub on this match, so get the
+;; correct match positions.
+(goto-char (match-end 0))
+(let ((value (nth 1 split)))
+	(re-search-backward (if (symbolp value)
+				(cdr (assq value nnmail-split-abbrev-alist))
+			      value)
+			    (match-end 1)))
+(nnmail-split-it (nth 2 split))))
+;; Not in cache, compute a regexp for the field/value pair.
+(t
+(let* ((field (nth 0 split))
+	   (value (nth 1 split))
+	   (regexp (concat "^\\(\\("
+			   (if (symbolp field)
+			       (cdr (assq field nnmail-split-abbrev-alist))
+			     field)
+			   "\\):.*\\)\\<\\("
+			   (if (symbolp value)
+			       (cdr (assq value nnmail-split-abbrev-alist))
+			     value)
+			   "\\)\\>")))
+(push (cons split regexp) nnmail-split-cache)
+;; Now that it's in the cache, just call nnmail-split-it again
+;; on the same split, which will find it immediately in the cache.
+(nnmail-split-it split)))))
+(defun nnmail-expand-newtext (newtext)
+(let ((len (length newtext))
+	(pos 0)
+	c expanded beg N did-expand)
+(while (< pos len)
+(setq beg pos)
+(while (and (< pos len)
+		  (not (= (aref newtext pos) ?\\)))
+	(setq pos (1+ pos)))
+(unless (= beg pos)
+	(push (substring newtext beg pos) expanded))
+(when (< pos len)
+	;; we hit a \, expand it.
+	(setq did-expand t)
+	(setq pos (1+ pos))
+	(setq c (aref newtext pos))
+	(if (not (or (= c ?\&)
+		     (and (>= c ?1)
+			  (<= c ?9))))
+	    ;; \ followed by some character we don't expand
+	    (push (char-to-string c) expanded)
+	  ;; \& or \N
+	  (if (= c ?\&)
+	      (setq N 0)
+	    (setq N (- c ?0)))
+	  (when (match-beginning N)
+	    (push (buffer-substring (match-beginning N) (match-end N))
+		  expanded))))
+(setq pos (1+ pos)))
+(if did-expand
+	(apply 'concat (nreverse expanded))
+newtext)))
 ;; Get a list of spool files to read.
 (defun nnmail-get-spool-files (&optional group)
 (if (null nnmail-spool-file)
 ;; No spool file whatsoever.
 		 (or (eq nnmail-spool-file 'procmail)
 		     nnmail-use-procmail)
 		 (directory-files
 		  nnmail-procmail-directory
 		  t (concat (if group (concat "^" group) "")
-			    nnmail-procmail-suffix "$") t)))
+			    nnmail-procmail-suffix "$"))))
 	   (p procmails)
 	   (crash (when (and (file-exists-p nnmail-crash-box)
 			     (> (nnheader-file-size
-				 (file-truename nnmail-crash-box)) 0))
+				 (file-truename nnmail-crash-box))
+				0))
 		    (list nnmail-crash-box))))
-;; Remove any directories that inadvertantly match the procmail
+;; Remove any directories that inadvertently match the procmail
 ;; suffix, which might happen if the suffix is "".
 (while p
 	(when (file-directory-p (car p))
 	  (setq procmails (delete (car p) procmails)))
 	(setq p (cdr p)))
 	      procmails)
 	     ((and group
 		   (eq nnmail-spool-file 'procmail))
 	      nil)
 	     ((listp nnmail-spool-file)
-	      (append nnmail-spool-file procmails))
+	      (nconc
-	     ((stringp nnmail-spool-file)
+	       (apply
+		'nconc
+		(mapcar
+		 (lambda (file)
+		   (if (file-directory-p file)
+		       (nnheader-directory-regular-files file)
+		     (list file)))
+		 nnmail-spool-file))
+	       procmails))
+	     ((and (stringp nnmail-spool-file)
+		   (not (file-directory-p nnmail-spool-file)))
 	      (cons nnmail-spool-file procmails))
+	     ((and (stringp nnmail-spool-file)
+		   (file-directory-p nnmail-spool-file))
+	      (nconc
+	       (nnheader-directory-regular-files nnmail-spool-file)
+	       procmails))
 	     ((eq nnmail-spool-file 'pop)
 	      (cons (format "po:%s" (user-login-name)) procmails))
 	     (t
 	      procmails))))))
 ;; already activated.
 (defun nnmail-activate (backend &optional force)
 (let (file timestamp file-time)
 (if (or (not (symbol-value (intern (format "%s-group-alist" backend))))
 	    force
-	    (and (setq file (condition-case ()
+	    (and (setq file (ignore-errors
-				(symbol-value (intern (format "%s-active-file"
+			      (symbol-value (intern (format "%s-active-file"
-							      backend)))
+							    backend)))))
-			      (error nil)))
 		 (setq file-time (nth 5 (file-attributes file)))
 		 (or (not
 		      (setq timestamp
 			    (condition-case ()
 				(symbol-value (intern
 		     (and (= (nth 0 file-time) (nth 0 timestamp))
 			  (> (nth 1 file-time) (nth 1 timestamp))))))
 	(save-excursion
 	  (or (eq timestamp 'none)
 	      (set (intern (format "%s-active-timestamp" backend))
-		   (current-time)))
+;;; dmoore@ucsd.edu 25.10.96
+;;; it's not always the case that current-time
+;;; does correspond to changes in the file's time.  So just compare
+;;; the file's new time against its own previous time.
+;;;		   (current-time)
+		   file-time
+		   ))
 	  (funcall (intern (format "%s-request-list" backend)))
-	  (set (intern (format "%s-group-alist" backend))
+;;; dmoore@ucsd.edu 25.10.96
-	       (nnmail-get-active))))
+;;; BACKEND-request-list already does this itself!
+;;;	  (set (intern (format "%s-group-alist" backend))
+;;;	       (nnmail-get-active))
+	  ))
 t))
 (defun nnmail-message-id ()
 (concat "<" (message-unique-id) "@totally-fudged-out-message-id>"))
 (save-excursion
 (set-buffer
 (setq nnmail-cache-buffer
 	     (get-buffer-create " *nnmail message-id cache*")))
 (buffer-disable-undo (current-buffer))
-(and (file-exists-p nnmail-message-id-cache-file)
+(when (file-exists-p nnmail-message-id-cache-file)
-	   (insert-file-contents nnmail-message-id-cache-file))
+	(nnheader-insert-file-contents nnmail-message-id-cache-file))
 (set-buffer-modified-p nil)
 (current-buffer))))
 (defun nnmail-cache-close ()
 (when (and nnmail-cache-buffer
 	     (buffer-modified-p nnmail-cache-buffer))
 (save-excursion
 (set-buffer nnmail-cache-buffer)
 ;; Weed out the excess number of Message-IDs.
 (goto-char (point-max))
-(and (search-backward "\n" nil t nnmail-message-id-cache-length)
+(when (search-backward "\n" nil t nnmail-message-id-cache-length)
-	   (progn
+	(progn
-	     (beginning-of-line)
+	  (beginning-of-line)
-	     (delete-region (point-min) (point))))
+	  (delete-region (point-min) (point))))
 ;; Save the buffer.
 (or (file-exists-p (file-name-directory nnmail-message-id-cache-file))
 	  (make-directory (file-name-directory nnmail-message-id-cache-file)
 			  t))
-(write-region (point-min) (point-max)
+(nnmail-write-region (point-min) (point-max)
-		    nnmail-message-id-cache-file nil 'silent)
+			   nnmail-message-id-cache-file nil 'silent)
 (set-buffer-modified-p nil)
 (setq nnmail-cache-buffer nil)
 ;;(kill-buffer (current-buffer))
 )))
 (save-excursion
 (set-buffer nnmail-cache-buffer)
 (goto-char (point-max))
 (search-backward id nil t))))
-(defun nnmail-check-duplication (message-id func)
+(defun nnmail-check-duplication (message-id func artnum-func)
+(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)
 	 (action (when duplication
 		   (cond
 		    ((memq nnmail-treat-duplicates '(warn delete))
 		     nnmail-treat-duplicates)
 		    ((nnheader-functionp nnmail-treat-duplicates)
 		     (funcall nnmail-treat-duplicates message-id))
 		    (t
-		     nnmail-treat-duplicates)))))
+		     nnmail-treat-duplicates))))
+	 group-art)
+;; Let the backend save the article (or not).
 (cond
 ((not duplication)
 (nnmail-cache-insert message-id)
-(funcall func))
+(funcall func (setq group-art
+			  (nreverse (nnmail-article-group artnum-func)))))
 ((eq action 'delete)
-(delete-region (point-min) (point-max)))
+(setq group-art nil))
 ((eq action 'warn)
 ;; We insert a warning.
 (let ((case-fold-search t)
 	    (newid (nnmail-message-id)))
 	(goto-char (point-min))
 	(beginning-of-line)
 	(insert
 	 "Message-ID: " newid "\n"
 	 "Gnus-Warning: This is a duplicate of message " message-id "\n")
 	(nnmail-cache-insert newid)
-	(funcall func)))
+	(funcall func (setq group-art
+			    (nreverse (nnmail-article-group artnum-func))))))
 (t
-(funcall func)))))
+(funcall func (setq group-art
+			  (nreverse (nnmail-article-group artnum-func))))))
+;; Add the group-art list to the history list.
+(if group-art
+	(push group-art nnmail-split-history)
+(delete-region (point-min) (point-max)))))
 ;;; Get new mail.
 (defun nnmail-get-value (&rest args)
 (let ((sym (intern (apply 'format args))))
 (symbol-value sym))))
 (defun nnmail-get-new-mail (method exit-func temp
 				   &optional group spool-func)
 "Read new incoming mail."
+;; Nix out the previous split history.
+(unless group
+(setq nnmail-split-history nil))
 (let* ((spools (nnmail-get-spool-files group))
 	 (group-in group)
 	 incoming incomings spool)
 (when (and (nnmail-get-value "%s-get-new-mail" method)
 	       nnmail-spool-file)
 ;; mail from each.
 (while spools
 	(setq spool (pop spools))
 	;; We read each spool file if either the spool is a POP-mail
 	;; spool, or the file exists.  We can't check for the
-	;; existance of POPped mail.
+	;; existence of POPped mail.
 	(when (or (string-match "^po:" spool)
-		  (and (file-exists-p spool)
+		  (and (file-exists-p (file-truename spool))
 		       (> (nnheader-file-size (file-truename spool)) 0)))
 	  (nnheader-message 3 "%s: Reading incoming mail..." method)
 	  (when (and (nnmail-move-inbox spool)
 		     (file-exists-p nnmail-crash-box))
 	    ;; There is new mail.  We first find out if all this mail
 	    ;; is supposed to go to some specific group.
 	    (setq group (nnmail-get-split-group spool group-in))
 	    ;; We split the mail
 	    (nnmail-split-incoming
 	     nnmail-crash-box (intern (format "%s-save-mail" method))
-	     spool-func group)
+	     spool-func group (intern (format "%s-active-number" method)))
 	    ;; Check whether the inbox is to be moved to the special tmp dir.
 	    (setq incoming
 		  (nnmail-make-complex-temp-name
 		   (expand-file-name
 		    (if nnmail-tmp-directory
 	     (setq days (nnmail-days-to-time days))
 	     ;; Compare the time with the current time.
 	     (nnmail-time-less days (nnmail-time-since time)))))))
 (defvar nnmail-read-passwd nil)
-(defun nnmail-read-passwd (prompt)
+(defun nnmail-read-passwd (prompt &rest args)
-(unless nnmail-read-passwd
+"Read a password using PROMPT.
-(if (load "passwd" t)
+If ARGS, PROMPT is used as an argument to `format'."
-	(setq nnmail-read-passwd 'read-passwd)
+(let ((prompt
-(autoload 'ange-ftp-read-passwd "ange-ftp")
+	 (if args
-(setq nnmail-read-passwd 'ange-ftp-read-passwd)))
+	     (apply 'format prompt args)
-(funcall nnmail-read-passwd prompt))
+	   prompt)))
+(unless nnmail-read-passwd
+(if (load "passwd" t)
+	  (setq nnmail-read-passwd 'read-passwd)
+	(autoload 'ange-ftp-read-passwd "ange-ftp")
+	(setq nnmail-read-passwd 'ange-ftp-read-passwd)))
+(funcall nnmail-read-passwd prompt)))
 (defun nnmail-check-syntax ()
 "Check (and modify) the syntax of the message in the current buffer."
 (save-restriction
 (message-narrow-to-head)
 (let ((case-fold-search t))
-(unless (re-search-forward "^Message-Id:" nil t)
+(unless (re-search-forward "^Message-ID:" nil t)
 	(insert "Message-ID: " (nnmail-message-id) "\n")))))
+(defun nnmail-write-region (start end filename &optional append visit lockname)
+"Do a `write-region', and then set the file modes."
+(write-region start end filename append visit lockname)
+(set-file-modes filename nnmail-default-file-modes))
+;;;
+;;; Status functions
+;;;
+(defun nnmail-replace-status (name value)
+"Make status NAME and VALUE part of the current status line."
+(save-restriction
+(message-narrow-to-head)
+(let ((status (nnmail-decode-status)))
+(setq status (delq (member name status) status))
+(when value
+	(push (cons name value) status))
+(message-remove-header "status")
+(goto-char (point-max))
+(insert "Status: " (nnmail-encode-status status) "\n"))))
+(defun nnmail-decode-status ()
+"Return a status-value alist from STATUS."
+(goto-char (point-min))
+(when (re-search-forward "^Status: " nil t)
+(let (name value status)
+(save-restriction
+	;; Narrow to the status.
+	(narrow-to-region
+	 (point)
+	 (if (re-search-forward "^[^ \t]" nil t)
+	     (1- (point))
+	   (point-max)))
+	;; Go through all elements and add them to the list.
+	(goto-char (point-min))
+	(while (re-search-forward "[^ \t=]+" nil t)
+	  (setq name (match-string 0))
+	  (if (not (= (following-char) ?=))
+	      ;; Implied "yes".
+	      (setq value "yes")
+	    (forward-char 1)
+	    (if (not (= (following-char) ?\"))
+		(if (not (looking-at "[^ \t]"))
+		    ;; Implied "no".
+		    (setq value "no")
+		  ;; Unquoted value.
+		  (setq value (match-string 0))
+		  (goto-char (match-end 0)))
+	      ;; Quoted value.
+	      (setq value (read (current-buffer)))))
+	  (push (cons name value) status)))
+status)))
+(defun nnmail-encode-status (status)
+"Return a status string from STATUS."
+(mapconcat
+(lambda (elem)
+(concat
+(car elem) "="
+(if (string-match "[ \t]" (cdr elem))
+	  (prin1-to-string (cdr elem))
+	(cdr elem))))
+status " "))
+(defun nnmail-split-history ()
+"Generate an overview of where the last mail split put articles."
+(interactive)
+(unless nnmail-split-history
+(error "No current split history"))
+(with-output-to-temp-buffer "*nnmail split history*"
+(let ((history nnmail-split-history)
+	  elem)
+(while (setq elem (pop history))
+	(princ (mapconcat (lambda (ga)
+			    (concat (car ga) ":" (int-to-string (cdr ga))))
+			  elem
+			  ", "))
+	(princ "\n")))))
+(defun nnmail-new-mail-p (group)
+"Say whether GROUP has new mail."
+(let ((his nnmail-split-history)
+	found)
+(while his
+(when (assoc group (pop his))
+	(setq found t
+	      his nil)))
+found))
 (run-hooks 'nnmail-load-hook)
 (provide 'nnmail)
 ;;; nnmail.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/gnus/nnmail.el @ 16:0293115a14e9 r19-15b91