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

comparison lisp/gnus/nnmail.el @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	8d2a9b52c682
children	0d2f883870bc

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
-;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96 Free Software Foundation, Inc.
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news, mail
 ;; This file is part of GNU Emacs.
 ;;; Code:
 (require 'nnheader)
 (require 'timezone)
 (require 'message)
-(require 'cl)
+(eval-when-compile (require 'cl))
-(require 'custom)
+(defvar nnmail-split-methods
-(eval-and-compile
-(autoload 'gnus-error "gnus-util"))
-(defgroup nnmail nil
-"Reading mail with Gnus."
-:group 'gnus)
-(defgroup nnmail-retrieve nil
-"Retrieving new mail."
-:group 'nnmail)
-(defgroup nnmail-prepare nil
-"Preparing (or mangling) new mail after retrival."
-:group 'nnmail)
-(defgroup nnmail-duplicate nil
-"Handling of duplicate mail messages."
-:group 'nnmail)
-(defgroup nnmail-split nil
-"Organizing the incomming mail in folders."
-:group 'nnmail)
-(defgroup nnmail-files nil
-"Mail files."
-:group 'gnus-files
-:group 'nnmail)
-(defgroup nnmail-expire nil
-"Expiring old mail."
-:group 'nnmail)
-(defgroup nnmail-procmail nil
-"Interfacing with procmail and other mail agents."
-:group 'nnmail)
-(defgroup nnmail-various nil
-"Various mail options."
-:group 'nnmail)
-(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 'nnmail-split
-: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>.
-(defcustom nnmail-crosspost t
+(defvar 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 'nnmail-split
-:type 'boolean)
 ;; Added by gord@enci.ucalgary.ca (Gordon Matzigkeit).
-(defcustom nnmail-keep-last-article nil
+(defvar 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 'nnmail-procmail
-:group 'nnmail-various
+(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 'nnmail-files
-:type 'boolean)
+(defvar nnmail-expiry-wait 7
-(defcustom nnmail-default-file-modes 384
-"Set the mode bits of all new mail files to this integer."
-:group 'nnmail-files
-: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 'nnmail-expire
-:type '(choice (const immediate)
+(defvar nnmail-expiry-wait-function nil
-		 (integer :tag "days")
+"*Variable that holds function to specify how old articles should be before they are expired.
-		 (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 'nnmail-expire
-:type '(choice (const :tag "nnmail-expiry-wait" nil)
+(defvar nnmail-spool-file
-		 (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."
-:group 'nnmail
-:type 'boolean)
-(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 \"/\"),
-treat all files in that directory as incoming spool files."
+(defvar nnmail-crash-box "~/.gnus-crash-box"
-:group 'nnmail-files
+"*File where Gnus will store mail while processing it.")
-:type 'file)
+(defvar nnmail-use-procmail nil
-(defcustom nnmail-crash-box "~/.gnus-crash-box"
-"File where Gnus will store mail while processing it."
-:group 'nnmail-files
-: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 'nnmail-procmail
-:type 'boolean)
+(defvar nnmail-procmail-directory "~/incoming/"
-(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 'nnmail-procmail
-:type 'directory)
+(defvar nnmail-procmail-suffix "\\.spool"
-(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 'nnmail-procmail
-:type 'regexp)
+(defvar nnmail-resplit-incoming nil
+"*If non-nil, re-split incoming procmail sorted mail.")
-(defcustom nnmail-resplit-incoming nil
-"*If non-nil, re-split incoming procmail sorted mail."
+(defvar nnmail-delete-file-function 'delete-file
-:group 'nnmail-procmail
+"Function called to delete files in some mail backends.")
-: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 'nnmail-files
-:type 'function)
-(defcustom nnmail-crosspost-link-function
-(if (string-match "windows-nt\\|emx" (format "%s" system-type))
-'copy-file
-'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 'nnmail-files
-:type '(radio (function-item add-name-to-file)
+(defvar nnmail-movemail-program "movemail"
-		(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\".")
-This can also be a function.  In that case, the function will be
+(defvar nnmail-pop-password-required nil
-called with two parameters -- the name of the INBOX file, and the file
+"*Non-nil if a password is required when reading mail using POP.")
-to be moved to."
-:group 'nnmail-files
+(defvar nnmail-read-incoming-hook nil
-:group 'nnmail-retrieve
+"*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 'nnmail-retrieve
-: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.
 If you use `display-time', you could use something like this:
 \(add-hook 'nnmail-read-incoming-hook
 	  (lambda ()
 	    ;; Update the displayed time, since that will clear out
 	    ;; the flag that says you have mail.
-	    (when (eq (process-status \"display-time\") 'run)
+	    (if (eq (process-status \"display-time\") 'run)
-	      (display-time-filter display-time-process \"\"))))"
+		(display-time-filter display-time-process \"\"))))")
-:group 'nnmail-prepare
-:type 'hook)
+(when (eq system-type 'windows-nt)
+(add-hook 'nnmail-prepare-incoming-hook 'nnheader-ms-strip-cr))
 ;; Suggested by Erik Selberg <speed@cs.washington.edu>.
-(defcustom nnmail-prepare-incoming-hook nil
+(defvar 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 'nnmail-prepare
-:type 'hook)
+(defvar nnmail-pre-get-new-mail-hook nil
+"Hook called just before starting to handle new incoming mail.")
-(defcustom nnmail-prepare-incoming-header-hook nil
-"Hook called narrowed to the headers of each message.
+(defvar nnmail-post-get-new-mail-hook nil
-This can be used to remove excessive spaces (and stuff like
+"Hook called just after finishing handling new incoming mail.")
-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."
-:group 'nnmail-prepare
-:type 'hook)
-(defcustom nnmail-list-identifiers nil
-"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)
-		 regexp
-		 (repeat regexp)))
-(defcustom nnmail-pre-get-new-mail-hook nil
-"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."
-:group 'nnmail-retrieve
-: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 'nnmail-split
-:type 'hook)
 ;; Suggested by Mejia Pablo J <pjm9806@usl.edu>.
-(defcustom nnmail-tmp-directory nil
+(defvar nnmail-tmp-directory nil
-"*If non-nil, use this directory for temporary storage.
+"*If non-nil, use this directory for temporary storage when reading incoming mail.")
-Used when reading incoming mail."
-:group 'nnmail-files
+(defvar nnmail-large-newsgroup 50
-:group 'nnmail-retrieve
-: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 'nnmail-various
-:type 'integer)
+(defvar nnmail-split-fancy "mail.misc"
+"*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:
 \(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.
+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 daemon are not crossposted to any of
+;; Messages from the mailer deamon 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 'nnmail-split
-;; Sigh!
+(defvar nnmail-split-abbrev-alist
-:type 'sexp)
-(defcustom nnmail-split-abbrev-alist
 '((any . "from\\|to\\|cc\\|sender\\|apparently-to\\|resent-from\\|resent-to\\|resent-cc")
-(mail . "mailer-daemon\\|postmaster\\|uucp")
+(mail . "mailer-daemon\\|postmaster"))
-(to . "to\\|cc\\|apparently-to\\|resent-to\\|resent-cc")
+"*Alist of abbreviations allowed in `nnmail-split-fancy'.")
-(from . "from\\|sender\\|resent-from"))
-"Alist of abbreviations allowed in `nnmail-split-fancy'."
+(defvar nnmail-delete-incoming t
-:group 'nnmail-split
+"*If non-nil, the mail backends will delete incoming files after splitting.")
-:type '(repeat (cons :format "%v" symbol regexp)))
+(defvar nnmail-message-id-cache-length 1000
-(defcustom nnmail-delete-incoming t
-"*If non-nil, the mail backends will delete incoming files after
-splitting."
-:group 'nnmail-retrieve
-: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 'nnmail-duplicate
-:type '(choice (const :tag "disable" nil)
+(defvar nnmail-message-id-cache-file "~/.nnmail-cache"
-		 (integer :format "%v")))
+"*The file name of the nnmail Message-ID cache.")
-(defcustom nnmail-message-id-cache-file "~/.nnmail-cache"
+(defvar nnmail-treat-duplicates 'warn
-"*The file name of the nnmail Message-ID cache."
-:group 'nnmail-duplicate
-:group 'nnmail-files
-: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 'nnmail-duplicate
-: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
 (defun nnmail-group-pathname (group dir &optional file)
 "Make pathname for GROUP."
 (concat
 (let ((dir (file-name-as-directory (expand-file-name dir))))
 ;; If this directory exists, we use it directly.
 (if (or nnmail-use-long-file-names
 	     (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."
-(condition-case ()
+(let* ((d1 (timezone-parse-date date))
-(let* ((d1 (timezone-parse-date date))
+	 (t1 (timezone-parse-time (aref d1 3))))
-	     (t1 (timezone-parse-time (aref d1 3))))
+(apply 'encode-time
-	(apply 'encode-time
+	   (mapcar (lambda (el)
-	       (mapcar (lambda (el)
+		     (and el (string-to-number el)))
-			 (and el (string-to-number el)))
+		   (list
-		       (list
+		    (aref t1 2) (aref t1 1) (aref t1 0)
-			(aref t1 2) (aref t1 1) (aref t1 0)
+		    (aref d1 2) (aref d1 1) (aref d1 0)
-			(aref d1 2) (aref d1 1) (aref d1 0)
+		    (aref d1 4))))))
-			(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 (when (< (nth 1 current) (nth 1 time))
+	 (rest (if (< (nth 1 current) (nth 1 time)) (expt 2 16))))
-		 (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'."
-(if (not (file-writable-p nnmail-crash-box))
+(let ((inbox (file-truename (expand-file-name inbox)))
-(gnus-error 1 "Can't write to crash box %s.  Not moving mail."
+	(tofile (file-truename (expand-file-name nnmail-crash-box)))
-		  nnmail-crash-box)
+	movemail popmail errors password)
-;; If the crash box exists and is empty, we delete it.
+;; If getting from mail spool directory,
-(when (and (file-exists-p nnmail-crash-box)
+;; use movemail to move rather than just renaming,
-	       (zerop (nnheader-file-size (file-truename nnmail-crash-box))))
+;; so as to interlock with the mailer.
-(delete-file nnmail-crash-box))
+(unless (setq popmail (string-match "^po:" (file-name-nondirectory inbox)))
-(let ((inbox (file-truename (expand-file-name inbox)))
+(setq movemail t))
-	  (tofile (file-truename (expand-file-name nnmail-crash-box)))
+(when popmail
-	  movemail popmail errors result)
+(setq inbox (file-name-nondirectory inbox)))
-(if (setq popmail (string-match
+(when (and movemail
-			 "^po:" (file-name-nondirectory inbox)))
+	       ;; On some systems, /usr/spool/mail/foo is a directory
-	  (setq inbox (file-name-nondirectory inbox))
+	       ;; and the actual inbox is /usr/spool/mail/foo/foo.
-	(setq movemail t)
+	       (file-directory-p inbox))
-	;; On some systems, /usr/spool/mail/foo is a directory
+(setq inbox (expand-file-name (user-login-name) inbox)))
-	;; and the actual inbox is /usr/spool/mail/foo/foo.
+(if (member inbox nnmail-moved-inboxes)
-	(when (file-directory-p inbox)
+	nil
-	  (setq inbox (expand-file-name (user-login-name) inbox))))
+(if popmail
-(if (member inbox nnmail-moved-inboxes)
+	  (progn
-	  ;; We don't try to move an already moved inbox.
+	    (setq nnmail-internal-password nnmail-pop-password)
-	  nil
+	    (when (and nnmail-pop-password-required (not nnmail-pop-password))
-	(if popmail
+	      (setq nnmail-internal-password
-	    (progn
+		    (nnmail-read-passwd
-	      (when (and nnmail-pop-password
+		     (format "Password for %s: "
-			 (not nnmail-internal-password))
+			     (substring inbox (+ popmail 3))))))
-		(setq nnmail-internal-password nnmail-pop-password))
+	    (message "Getting mail from post office ..."))
-	      (when (and nnmail-pop-password-required
+	(when (or (and (file-exists-p tofile)
-			 (not nnmail-internal-password))
+		       (/= 0 (nnheader-file-size tofile)))
-		(setq nnmail-internal-password
+		  (and (file-exists-p inbox)
-		      (nnmail-read-passwd
+		       (/= 0 (nnheader-file-size inbox))))
-		       (format "Password for %s: "
+	  (message "Getting mail from %s..." inbox)))
-			       (substring inbox (+ popmail 3))))))
+;; Set TOFILE if have not already done so, and
-	      (message "Getting mail from post office ..."))
+;; rename or copy the file INBOX to TOFILE if and as appropriate.
-	  (when (or (and (file-exists-p tofile)
+(cond
-			 (/= 0 (nnheader-file-size tofile)))
+((file-exists-p tofile)
-		    (and (file-exists-p inbox)
+	;; The crash box exists already.
-			 (/= 0 (nnheader-file-size inbox))))
+	t)
-	    (message "Getting mail from %s..." inbox)))
+((and (not popmail)
-	;; Set TOFILE if have not already done so, and
+	     (not (file-exists-p inbox)))
-	;; rename or copy the file INBOX to TOFILE if and as appropriate.
+	;; There is no inbox.
-	(cond
+	(setq tofile nil))
-	 ((file-exists-p tofile)
+((and (not movemail) (not popmail))
-	  ;; The crash box exists already.
+	;; Try copying.  If that fails (perhaps no space),
-	  t)
+	;; rename instead.
-	 ((and (not popmail)
+	(condition-case nil
-	       (not (file-exists-p inbox)))
+	    (copy-file inbox tofile nil)
-	  ;; There is no inbox.
+	  (error
-	  (setq tofile nil))
+	   ;; Third arg is t so we can replace existing file TOFILE.
-	 (t
+	   (rename-file inbox tofile t)))
-	  ;; If getting from mail spool directory, use movemail to move
+	(push inbox nnmail-moved-inboxes)
-	  ;; rather than just renaming, so as to interlock with the
+	;; Make the real inbox file empty.
-	  ;; mailer.
+	;; Leaving it deleted could cause lossage
-	  (unwind-protect
+	;; because mailers often won't create the file.
-	      (save-excursion
+	(condition-case ()
-		(setq errors (generate-new-buffer " *nnmail loss*"))
+	    (write-region (point) (point) inbox)
-		(buffer-disable-undo errors)
+	  (file-error nil)))
-		(let ((default-directory "/"))
+(t
-		  (if (nnheader-functionp nnmail-movemail-program)
+	;; Use movemail.
-		      (condition-case err
+	(unwind-protect
-			  (progn
+	    (save-excursion
-			    (funcall nnmail-movemail-program inbox tofile)
+	      (setq errors (generate-new-buffer " *nnmail loss*"))
-			    (setq result 0))
+	      (buffer-disable-undo errors)
-			(error
+	      (let ((default-directory "/"))
-			 (save-excursion
+		(apply
-			   (set-buffer errors)
+		 'call-process
-			   (insert (prin1-to-string err))
+		 (append
-			   (setq result 255))))
+		  (list
-		    (setq result
+		   (expand-file-name nnmail-movemail-program exec-directory)
-			  (apply
+		   nil errors nil inbox tofile)
-			   'call-process
+		  (when nnmail-internal-password
-			   (append
+		    (list nnmail-internal-password)))))
-			    (list
+	      (if (not (buffer-modified-p errors))
-			     (expand-file-name
+		  ;; No output => movemail won
-			      nnmail-movemail-program exec-directory)
+		  (push inbox nnmail-moved-inboxes)
-			     nil errors nil inbox tofile)
+		(set-buffer errors)
-			    (when nnmail-internal-password
+		(subst-char-in-region (point-min) (point-max) ?\n ?\  )
-			      (list nnmail-internal-password)))))))
+		(goto-char (point-max))
-		(if (and (not (buffer-modified-p errors))
+		(skip-chars-backward " \t")
-			 (zerop result))
+		(delete-region (point) (point-max))
-		    ;; No output => movemail won
+		(goto-char (point-min))
-		    (progn
+		(if (looking-at "movemail: ")
-		      (unless popmail
+		    (delete-region (point-min) (match-end 0)))
-			(when (file-exists-p tofile)
+		(error (concat "movemail: " (buffer-string)))
-			  (set-file-modes tofile nnmail-default-file-modes)))
+		(setq tofile nil))))))
-		      (push inbox nnmail-moved-inboxes))
+(and errors
-		  (set-buffer errors)
+	   (buffer-name errors)
-		  ;; There may be a warning about older revisions.  We
+	   (kill-buffer errors))
-		  ;; ignore those.
+tofile)))
-		  (goto-char (point-min))
-		  (if (search-forward "older revision" nil t)
-		      (progn
-			(unless popmail
-			  (when (file-exists-p tofile)
-			    (set-file-modes tofile nnmail-default-file-modes)))
-			(push inbox nnmail-moved-inboxes))
-		    ;; Probably a real error.
-		    (subst-char-in-region (point-min) (point-max) ?\n ?\  )
-		    (goto-char (point-max))
-		    (skip-chars-backward " \t")
-		    (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 (%d return).  Continue? "
-				     (buffer-string) result))
-		      (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)
 ;; Go through all groups from the active list.
 (save-excursion
 (set-buffer nntp-server-buffer)
 (goto-char (point-min))
 (while (re-search-forward
 	      "^\\([^ \t]+\\)[ \t]+\\([0-9]+\\)[ \t]+\\([0-9]+\\)" nil t)
 	;; We create an alist with `(GROUP (LOW . HIGH))' elements.
 	(push (list (match-string 1)
 		    (cons (string-to-int (match-string 3))
 			  (string-to-int (match-string 2))))
 group-assoc))
 (defun nnmail-save-active (group-assoc file-name)
 "Save GROUP-ASSOC in ACTIVE-FILE."
 (when file-name
-(nnheader-temp-write file-name
+(let (group)
-(nnmail-generate-active group-assoc))))
+(save-excursion
+	(set-buffer (get-buffer-create " *nnmail active*"))
-(defun nnmail-generate-active (alist)
+	(buffer-disable-undo (current-buffer))
-"Generate an active file from group-alist ALIST."
+	(erase-buffer)
-(erase-buffer)
+	(while group-assoc
-(let (group)
+	  (setq group (pop group-assoc))
-(while (setq group (pop alist))
+	  (insert (format "%s %d %d y\n" (car group) (cdadr group)
-(insert (format "%s %d %d y\n" (car group) (cdadr group)
+			  (caadr group))))
-		      (caadr group))))))
+	(unless (file-exists-p (file-name-directory file-name))
+	  (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)
-(if (string-match (concat "^" (expand-file-name
+(cond (group group)
-				     (file-name-as-directory
+	    ((string-match (concat "^" (expand-file-name
-				      nnmail-procmail-directory))
+					(file-name-as-directory
-				"\\([^/]*\\)" nnmail-procmail-suffix "$")
+					 nnmail-procmail-directory))
-			(expand-file-name file))
+				   "\\([^/]*\\)" nnmail-procmail-suffix "$")
-	  (let ((procmail-group (substring (expand-file-name file)
+			   (expand-file-name file))
-					   (match-beginning 1)
+	     (substring (expand-file-name file)
-					   (match-end 1))))
+			(match-beginning 1) (match-end 1)))
-	    (if group
+	    (t
-		(if (string-equal group procmail-group)
+	     group))
-		    group
-		  nil)
-	      procmail-group))
-	nil)
 group))
-(defun nnmail-process-babyl-mail-format (func artnum-func)
+(defun nnmail-process-babyl-mail-format (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))
-(narrow-to-region
+(setq start (point))
-(setq start (point))
+;; Skip all the headers in case there are more "From "s...
-(progn
+(or (search-forward "\n\n" nil t)
-	 ;; Skip all the headers in case there are more "From "s...
+	  (search-forward-regexp "^[^:]*\\( .*\\|\\)$" nil t)
-	 (or (search-forward "\n\n" nil t)
+	  (search-forward ""))
-	     (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
+	(if (re-search-backward "^Message-ID:[ \t]*\\(<[^>]*>\\)" nil t)
-	     "^Message-ID[ \t]*:[ \n\t]*\\(<[^>]*>\\)" nil t)
 	    (setq message-id (buffer-substring (match-beginning 1)
 					       (match-end 1)))
 	  ;; There is no Message-ID here, so we create one.
 	  (save-excursion
-	    (when (re-search-backward "^Message-ID[ \t]*:" 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")))
 ;; Look for a Content-Length header.
 (if (not (save-excursion
 		 (and (re-search-backward
 		       "^Content-Length:[ \t]*\\([0-9]+\\)" start t)
 		      (setq content-length (string-to-int
 					    (buffer-substring
 					     (match-beginning 1)
 					     (match-end 1))))
 		      ;; 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.
 		      (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.
-(when do-search
+(if 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 artnum-func)
+	  (nnmail-check-duplication message-id func)
 	  (setq end (point-max))))
 (goto-char end))))
-(defsubst nnmail-search-unix-mail-delim ()
+(defun nnmail-search-unix-mail-delim ()
-"Put point at the beginning of the next Unix mbox message."
+"Put point at the beginning of the next message."
-;; Algorithm used to find the the next article in the
+(let ((case-fold-search t)
-;; brain-dead Unix mbox format:
+	(delim (concat "^" message-unix-mail-delimiter))
-;;
-;; 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-forward "^From " nil t))
+(if (re-search-forward delim nil t)
-	  (setq found 'no)
+	  (when (or (looking-at "[^\n :]+ *:")
-	(save-excursion
+		    (looking-at delim)
-	  (beginning-of-line)
+		    (looking-at (concat ">" message-unix-mail-delimiter)))
-	  (when (and (or (bobp)
+	    (forward-line -1)
-			 (save-excursion
+	    (setq found 'yes))
-			   (forward-line -1)
+	(setq found 'no)))
-			   (= (following-char) ?\n)))
-		     (save-excursion
-		       (forward-line 1)
-		       (while (looking-at ">From ")
-			 (forward-line 1))
-		       (looking-at "[^ \n\t:]+[ \n\t]*:")))
-	    (setq found 'yes)))))
-(beginning-of-line)
 (eq found 'yes)))
-(defun nnmail-search-unix-mail-delim-backward ()
+(defun nnmail-process-unix-mail-format (func)
-"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 "[^ \n\t:]+[ \n\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 "^From " nil t)
+(if (not (and (re-search-forward delim 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))
 	(setq start (point)
 	      end nil)
 	;; Find the end of the head.
 	(narrow-to-region
 	 start
 	 (if (search-forward "\n\n" nil t)
 	     (1- (point))
 	   ;; This will never happen, but just to be on the safe side --
 	   ;; if there is no head-body delimiter, we search a bit manually.
 	   (while (and (looking-at "From \\|[^ \t]+:")
 		       (not (eobp)))
-	     (forward-line 1))
+	     (forward-line 1)
-	   (point)))
+	     (point))))
 	;; Find the Message-ID header.
 	(goto-char (point-min))
-	(if (re-search-forward "^Message-ID[ \t]*:[ \n\t]*\\(<[^>]+>\\)" nil t)
+	(if (re-search-forward "^Message-ID:[ \t]*\\(<[^>]+>\\)" nil t)
 	    (setq message-id (match-string 1))
 	  (save-excursion
-	    (when (re-search-forward "^Message-ID[ \t]*:" nil t)
+	    (when (re-search-forward "^Message-ID:" nil t)
 	      (beginning-of-line)
 	      (insert "Original-")))
 	  ;; There is no Message-ID here, so we create one.
 	  (forward-line 1)
 	  (insert "Message-ID: " (setq message-id (nnmail-message-id)) "\n"))
 	(goto-char (point-min))
 	(if (not (re-search-forward
 		  "^Content-Length:[ \t]*\\([0-9]+\\)" nil t))
 	    (setq content-length nil)
 	  (setq content-length (string-to-int (match-string 1)))
 	  ;; 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 "From ")
+		((looking-at delim)
 		 (setq end skip))
-		((looking-at "[ \t]*\n\\(From \\)")
+		((looking-at
+		  (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
 	  ;; article or the end of the buffer.
 	  (goto-char head-end)
 	  (or (nnmail-search-unix-mail-delim)
 	      (goto-char (point-max))))
 	;; 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 artnum-func)
+	    (nnmail-check-duplication message-id func)
 	    (setq end (point-max))))
 	(goto-char end)))))
-(defun nnmail-process-mmdf-mail-format (func artnum-func)
+(defun nnmail-process-mmdf-mail-format (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)
 ;; Carry on until the bitter end.
 (while (not (eobp))
 	(setq start (point))
 	;; Find the end of the head.
 	(narrow-to-region
 	 start
 	 (if (search-forward "\n\n" nil t)
 	     (1- (point))
 	   ;; This will never happen, but just to be on the safe side --
 	   ;; if there is no head-body delimiter, we search a bit manually.
 	   (while (and (looking-at "From \\|[^ \t]+:")
 		       (not (eobp)))
-	     (forward-line 1))
+	     (forward-line 1)
-	   (point)))
+	     (point))))
 	;; Find the Message-ID header.
 	(goto-char (point-min))
-	(if (re-search-forward "^Message-ID[ \t]*:[ \n\t]*\\(<[^>]+>\\)" nil t)
+	(if (re-search-forward "^Message-ID:[ \t]*\\(<[^>]+>\\)" nil t)
 	    (setq message-id (match-string 1))
 	  ;; There is no Message-ID here, so we create one.
 	  (save-excursion
-	    (when (re-search-backward "^Message-ID[ \t]*:" 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 artnum-func)
+	    (nnmail-check-duplication message-id func)
 	    (setq end (point-max))))
 	(goto-char end)
 	(forward-line 2)))))
-(defun nnmail-split-incoming (incoming func &optional exit-func
+(defun nnmail-split-incoming (incoming func &optional exit-func group)
-				       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 incoming)
+(nnheader-insert-file-contents-literally 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
-	;; fetching from a file.
+	;; fetches from a file.
 	(cond ((or (looking-at "\^L")
 		   (looking-at "BABYL OPTIONS:"))
-	       (nnmail-process-babyl-mail-format func artnum-func))
+	       (nnmail-process-babyl-mail-format func))
 	      ((looking-at "\^A\^A\^A\^A")
-	       (nnmail-process-mmdf-mail-format func artnum-func))
+	       (nnmail-process-mmdf-mail-format func))
 	      (t
-	       (nnmail-process-unix-mail-format func artnum-func))))
+	       (nnmail-process-unix-mail-format func))))
-(when exit-func
+(if exit-func (funcall 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.
 FUNC will be called with the group name to determine the article number."
 (let ((methods nnmail-split-methods)
 	(obuf (current-buffer))
 	(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))
-	    (let ((split
+	    ;; `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)))
 		   (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
-		       (ignore-errors
+		       (condition-case ()
-			 (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)))
-		       ;; Don't enter the article into the same
+			 (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)))))))))
-	;; See whether the split methods returned `junk'.
+	group-art))))
-	(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
+(cond ((stringp split)
-;; nil split
+	 ;; A group.
-((null split)
+	 (list split))
-nil)
+	((eq (car split) '&)
+	 (apply 'nconc (mapcar 'nnmail-split-it (cdr split))))
-;; A group name.  Do the \& and \N subs into the string.
+	((eq (car split) '|)
-((stringp split)
+	 (let (done)
-(list (nnmail-expand-newtext split)))
+	   (while (and (not done) (cdr split))
+	     (setq split (cdr split)
-;; Junk the message.
+		   done (nnmail-split-it (car split))))
-((eq split 'junk)
+	   done))
-(list 'junk))
+	((assq split nnmail-split-cache)
+	 ;; A compiled match expression.
-;; Builtin & operation.
+	 (goto-char (point-max))
-((eq (car split) '&)
+	 (if (re-search-backward (cdr (assq split nnmail-split-cache)) nil t)
-(apply 'nconc (mapcar 'nnmail-split-it (cdr split))))
+	     (nnmail-split-it (nth 2 split))))
+	(t
-;; Builtin | operation.
+	 ;; An uncompiled match.
-((eq (car split) '|)
+	 (let* ((field (nth 0 split))
-(let (done)
+		(value (nth 1 split))
-(while (and (not done) (cdr split))
+		(regexp (concat "^\\("
-	(setq split (cdr split)
+				(if (symbolp field)
-	      done (nnmail-split-it (car split))))
+				    (cdr (assq field
-done))
+					       nnmail-split-abbrev-alist))
+				  field)
-;; Builtin : operation.
+				"\\):.*\\<\\("
-((eq (car split) ':)
+				(if (symbolp value)
-(nnmail-split-it (eval (cdr split))))
+				    (cdr (assq value
+					       nnmail-split-abbrev-alist))
-;; Check the cache for the regexp for this split.
+				  value)
-;; FIX FIX FIX could avoid calling assq twice here
+				"\\)\\>")))
-((assq split nnmail-split-cache)
+	   (setq nnmail-split-cache
-(goto-char (point-max))
+		 (cons (cons split regexp) nnmail-split-cache))
-;; FIX FIX FIX problem with re-search-backward is that if you have
+	   (goto-char (point-max))
-;; a split: (from "foo-\\(bar\\|baz\\)@gnus.org "mail.foo.\\1")
+	   (if (re-search-backward regexp nil t)
-;; and someone mails a message with 'To: foo-bar@gnus.org' and
+	       (nnmail-split-it (nth 2 split)))))))
-;; '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.
 nil
 (let* ((procmails
 	    ;; If procmail is used to get incoming mail, the files
 	    ;; are stored in this directory.
 	    (and (file-exists-p nnmail-procmail-directory)
 		 (or (eq nnmail-spool-file 'procmail)
 		     nnmail-use-procmail)
 		 (directory-files
 		  nnmail-procmail-directory
 		  t (concat (if group (concat "^" group) "")
-			    nnmail-procmail-suffix "$"))))
+			    nnmail-procmail-suffix "$") t)))
 	   (p procmails)
 	   (crash (when (and (file-exists-p nnmail-crash-box)
 			     (> (nnheader-file-size
-				 (file-truename nnmail-crash-box))
+				 (file-truename nnmail-crash-box)) 0))
-				0))
 		    (list nnmail-crash-box))))
-;; Remove any directories that inadvertently match the procmail
+;; Remove any directories that inadvertantly 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)))
 ;; Return the list of spools.
 (append
 crash
 (cond ((and group
 		   (or (eq nnmail-spool-file 'procmail)
 		       nnmail-use-procmail)
 		   procmails)
 	      procmails)
 	     ((and group
 		   (eq nnmail-spool-file 'procmail))
 	      nil)
 	     ((listp nnmail-spool-file)
-	      (nconc
+	      (append nnmail-spool-file procmails))
-	       (apply
-		'nconc
-		(mapcar
-		 (lambda (file)
-		   (if (and (not (string-match "^po:" file))
-			    (file-directory-p file))
-		       (nnheader-directory-regular-files file)
-		     (list file)))
-		 nnmail-spool-file))
-	       procmails))
 	     ((stringp nnmail-spool-file)
-	      (if (and (not (string-match "^po:" nnmail-spool-file))
+	      (cons nnmail-spool-file procmails))
-		       (file-directory-p nnmail-spool-file))
-		  (nconc
-		   (nnheader-directory-regular-files nnmail-spool-file)
-		   procmails)
-		(cons nnmail-spool-file procmails)))
 	     ((eq nnmail-spool-file 'pop)
 	      (cons (format "po:%s" (user-login-name)) procmails))
 	     (t
 	      procmails))))))
 ;; Activate a backend only if it isn't already activated.
 ;; If FORCE, re-read the active file even if the backend is
 ;; 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 (ignore-errors
+	    (and (setq file (condition-case ()
-			      (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
 					       (format "%s-active-timestamp"
 						       backend)))
 			      (error 'none))))
 		     (not (consp timestamp))
 		     (equal timestamp '(0 0))
 		     (> (nth 0 file-time) (nth 0 timestamp))
 		     (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))
-		   file-time))
+		   (current-time)))
-	  (funcall (intern (format "%s-request-list" backend)))))
+	  (funcall (intern (format "%s-request-list" backend)))
+	  (set (intern (format "%s-group-alist" backend))
+	       (nnmail-get-active))))
 t))
 (defun nnmail-message-id ()
 (concat "<" (message-unique-id) "@totally-fudged-out-message-id>"))
 (if (or (not nnmail-treat-duplicates)
 	  (and nnmail-cache-buffer
 	       (buffer-name nnmail-cache-buffer)))
 ()				; The buffer is open.
 (save-excursion
 (set-buffer
 (setq nnmail-cache-buffer
 	     (get-buffer-create " *nnmail message-id cache*")))
 (buffer-disable-undo (current-buffer))
-(when (file-exists-p nnmail-message-id-cache-file)
+(and (file-exists-p nnmail-message-id-cache-file)
-	(nnheader-insert-file-contents nnmail-message-id-cache-file))
+	   (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))
-(when (search-backward "\n" nil t nnmail-message-id-cache-length)
+(and (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))
-(nnmail-write-region (point-min) (point-max)
+(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)))))
+;;(kill-buffer (current-buffer))
+)))
 (defun nnmail-cache-insert (id)
 (when nnmail-treat-duplicates
-(unless (gnus-buffer-live-p nnmail-cache-buffer)
-(nnmail-cache-open))
 (save-excursion
 (set-buffer nnmail-cache-buffer)
 (goto-char (point-max))
 (insert id "\n"))))
 (save-excursion
 (set-buffer nnmail-cache-buffer)
 (goto-char (point-max))
 (search-backward id nil t))))
-(defun nnmail-fetch-field (header)
+(defun nnmail-check-duplication (message-id func)
-(save-excursion
-(save-restriction
-(message-narrow-to-head)
-(message-fetch-field header))))
-(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 (setq group-art
+(funcall func))
-			  (nreverse (nnmail-article-group artnum-func)))))
 ((eq action 'delete)
-(setq group-art nil))
+(delete-region (point-min) (point-max)))
 ((eq action 'warn)
 ;; We insert a warning.
-(let ((case-fold-search t))
+(let ((case-fold-search t)
+	    (newid (nnmail-message-id)))
 	(goto-char (point-min))
-	(re-search-forward "^message-id[ \t]*:" nil t)
+	(when (re-search-forward "^message-id:" nil t)
+	  (beginning-of-line)
+	  (insert "Original-"))
 	(beginning-of-line)
 	(insert
+	 "Message-ID: " newid "\n"
 	 "Gnus-Warning: This is a duplicate of message " message-id "\n")
-	(funcall func (setq group-art
+	(nnmail-cache-insert newid)
-			    (nreverse (nnmail-article-group artnum-func))))))
+	(funcall func)))
 (t
-(funcall func (setq group-art
+(funcall func)))))
-			  (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
-	;; existence of POPped mail.
+	;; existance of POPped mail.
 	(when (or (string-match "^po:" spool)
-		  (and (file-exists-p (file-truename spool))
+		  (and (file-exists-p 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 (intern (format "%s-active-number" method)))
+	     spool-func group)
 	    ;; 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
 			(concat
 			 (file-name-as-directory nnmail-tmp-directory)
-			 (file-name-nondirectory
+			 (file-name-nondirectory (concat temp "Incoming")))
-			  (concat (file-name-as-directory temp) "Incoming")))
+		      (concat temp "Incoming")))))
-		      (concat (file-name-as-directory temp) "Incoming")))))
 	    (rename-file nnmail-crash-box incoming t)
 	    (push incoming incomings))))
 ;; If we did indeed read any incoming spools, we save all info.
 (when incomings
 	(nnmail-save-active
 	 (nnmail-get-value "%s-group-alist" method)
 	 (nnmail-get-value "%s-active-file" method))
 	(when exit-func
 	  (funcall exit-func))
 	(run-hooks 'nnmail-read-incoming-hook)
 	     (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 &rest args)
+(defun nnmail-read-passwd (prompt)
-"Read a password using PROMPT.
+(unless nnmail-read-passwd
-If ARGS, PROMPT is used as an argument to `format'."
+(if (load "passwd" t)
-(let ((prompt
+	(setq nnmail-read-passwd 'read-passwd)
-	 (if args
+(autoload 'ange-ftp-read-passwd "ange-ftp")
-	     (apply 'format prompt args)
+(setq nnmail-read-passwd 'ange-ftp-read-passwd)))
-	   prompt)))
+(funcall nnmail-read-passwd prompt))
-(unless nnmail-read-passwd
-(if (load "passwd" t)
-	  (setq nnmail-read-passwd 'read-passwd)
-	(unless (fboundp 'ange-ftp-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[ \t]*:" 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))
-(eval-and-compile
-(autoload 'pop3-movemail "pop3"))
-(defun nnmail-pop3-movemail (inbox crashbox)
-"Function to move mail from INBOX on a pop3 server to file CRASHBOX."
-(let ((pop3-maildrop
-(substring inbox (match-end (string-match "^po:" inbox)))))
-(pop3-movemail crashbox)))
 (run-hooks 'nnmail-load-hook)
 (provide 'nnmail)
 ;;; nnmail.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/gnus/nnmail.el @ 70:131b0175ea99 r20-0b30