;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
"/usr/contrib/mh/bin/" ; BSDI
"/usr/pkg/bin/" ; NetBSD
"/usr/local/bin/"
- "/usr/local/bin/mu-mh/" ; GNU mailutils - default
- "/usr/bin/mu-mh/") ; GNU mailutils - packaged
+ "/usr/local/bin/mu-mh/" ; GNU mailutils MH - default
+ "/usr/bin/mu-mh/") ; GNU mailutils MH - packaged
"List of directories to search for variants of the MH variant.
The list `exec-path' is searched in addition to this list.
There's no need for users to modify this list. Instead add extra
process))
(defun mh-exec-cmd-env-daemon (env command filter &rest args)
- "In ennvironment ENV, execute mh-command COMMAND in the background.
+ "In environment ENV, execute mh-command COMMAND in the background.
ENV is nil or a string of space-separated \"var=value\" elements.
Signals an error if process does not complete successfully.
See `mh-variant'."
:group 'mh-e
:type '(repeat (directory))
- :package-version '(MH-E "8.0"))
+ :package-version '(MH-E . "8.0"))
(defun mh-variants ()
"Return a list of installed variants of MH on the system.
(cond
((mh-variant-mh-info dir))
((mh-variant-nmh-info dir))
- ((mh-variant-mu-mh-info dir))))))
+ ((mh-variant-gnu-mh-info dir))))))
(defun mh-variant-mh-info (dir)
- "Return info for MH variant in DIR assuming a temporary buffer is setup."
+ "Return info for MH variant in DIR assuming a temporary buffer is set up."
;; MH does not have the -version option.
;; Its version number is included in the output of "-help" as:
;;
(mh-progs ,dir)
(flists nil)))))))))
-(defun mh-variant-mu-mh-info (dir)
- "Return info for GNU mailutils variant in DIR.
-This assumes that a temporary buffer is setup."
+(defun mh-variant-gnu-mh-info (dir)
+ "Return info for GNU mailutils MH variant in DIR.
+This assumes that a temporary buffer is set up."
;; 'mhparam -version' output:
;; mhparam (GNU mailutils 0.3.2)
(let ((mhparam (expand-file-name "mhparam" dir)))
(let ((version (match-string 1))
(mh-progs dir))
`(,version
- (variant mu-mh)
+ (variant gnu-mh)
(mh-lib-progs ,(mh-profile-component "libdir"))
(mh-lib ,(mh-profile-component "etcdir"))
(mh-progs ,dir)
(expand-file-name "flists" dir)))))))))
(defun mh-variant-nmh-info (dir)
- "Return info for nmh variant in DIR assuming a temporary buffer is setup."
+ "Return info for nmh variant in DIR assuming a temporary buffer is set up."
;; `mhparam -version' outputs:
;; mhparam -- nmh-1.1-RC1 [compiled on chaak at Fri Jun 20 11:03:28 PDT 2003]
(let ((mhparam (expand-file-name "mhparam" dir)))
(and (file-regular-p file) (file-executable-p file)))
(defun mh-variant-set-variant (variant)
- "Setup the system variables for the MH variant named VARIANT.
+ "Set up the system variables for the MH variant named VARIANT.
If VARIANT is a string, use that key in the alist returned by the
function `mh-variants'.
If VARIANT is a symbol, select the first entry that matches that
(defun mh-variant-p (&rest variants)
"Return t if variant is any of VARIANTS.
-Currently known variants are 'MH, 'nmh, and 'mu-mh."
+Currently known variants are 'MH, 'nmh, and 'gnu-mh."
(let ((variant-in-use
(cadr (assoc 'variant (assoc mh-variant-in-use (mh-variants))))))
(not (null (member variant-in-use variants)))))
(defun mh-profile-component (component)
"Return COMPONENT value from mhparam, or nil if unset."
(save-excursion
- ;; MH and nmh use -components, Mailutils uses -component. Since MH
- ;; and nmh work with an unambiguous prefix, the `s' is dropped here.
+ ;; MH and nmh use -components, GNU mailutils MH uses -component.
+ ;; Since MH and nmh work with an unambiguous prefix, the `s' is
+ ;; dropped here.
(mh-exec-cmd-quiet nil "mhparam" "-component" component)
(mh-profile-component-value component)))
Sets `mh-progs', `mh-lib', `mh-lib-progs' and
`mh-flists-present-flag'.
If the VARIANT is \"autodetect\", then first try nmh, then MH and
-finally GNU mailutils."
+finally GNU mailutils MH."
(interactive
(list (completing-read
"MH variant: "
(mapcar (lambda (x) (list (car x))) (mh-variants))
nil t)))
+
+ ;; TODO Remove mu-mh backwards compatibility in 9.0.
+ (when (and (stringp variant)
+ (string-match "^mu-mh" variant))
+ (message
+ (format "%s\n%s; %s" "The variant name mh-mh has been renamed to gnu-mh"
+ "and will be removed in MH-E 9.0"
+ "try M-x customize-option mh-variant"))
+ (sit-for 5)
+ (setq variant (concat "gnu-mh" (substring variant (match-end 0)))))
+
(let ((valid-list (mapcar (lambda (x) (car x)) (mh-variants))))
(cond
((eq variant 'none))
(message "%s installed as MH variant" mh-variant-in-use))
((mh-variant-set-variant 'mh)
(message "%s installed as MH variant" mh-variant-in-use))
- ((mh-variant-set-variant 'mu-mh)
+ ((mh-variant-set-variant 'gnu-mh)
(message "%s installed as MH variant" mh-variant-in-use))
(t
(message "No MH variant found on the system"))))
(message "Warning: %s variant not found. Autodetecting..." variant)
(mh-variant-set 'autodetect)))
(t
- (message "Unknown variant; use %s"
+ (message "Unknown variant %s; use %s"
+ variant
(mapconcat '(lambda (x) (format "%s" (car x)))
(mh-variants) " or "))))))
The default setting of this option is \"Auto-detect\" which means
that MH-E will automatically choose the first of nmh, MH, or GNU
-mailutils that it finds in the directories listed in
+mailutils MH that it finds in the directories listed in
`mh-path' (which you can customize), `mh-sys-path', and
`exec-path'. If MH-E can't find MH at all, you may have to
customize `mh-path' and add the directory in which the command
\"mhparam\" is located. If, on the other hand, you have both nmh
-and mailutils installed (for example) and `mh-variant-in-use' was
-initialized to nmh but you want to use mailutils, then you can
-set this option to \"mailutils\".
+and GNU mailutils MH installed (for example) and
+`mh-variant-in-use' was initialized to nmh but you want to use
+GNU mailutils MH, then you can set this option to \"gnu-mh\".
When this variable is changed, MH-E resets `mh-progs', `mh-lib',
`mh-lib-progs', `mh-flists-present-flag', and `mh-variant-in-use'
(set-default symbol value) ;Done in mh-variant-set-variant!
(mh-variant-set value))
:group 'mh-e
- :package-version '(MH-E "8.0"))
+ :package-version '(MH-E . "8.0"))
\f
The default setting for this option is \"Use MH-E scan Format\". This
means that the format string will be taken from the either
`mh-scan-format-mh' or `mh-scan-format-nmh' depending on whether MH or
-nmh (or GNU mailutils) is in use. This setting also enables you to
+nmh (or GNU mailutils MH) is in use. This setting also enables you to
turn on the `mh-adaptive-cmd-note-flag' option.
You can also set this option to \"Use Default scan Format\" to get the
:group 'mh-show
:package-version '(MH-E . "8.0"))
-;; Theese entries have been intentionally excluded by the developers.
-;; "X-Operator:" ; Similar to X-Mailer, so display it
+;; These entries have been intentionally excluded by the developers.
;; "Comments:" ; RFC 2822 - show this one
;; "Fax:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
;; "Mail-System-Version:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
;; "Mailer:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+;; "Organization:" ;
;; "Phone:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
;; "Reply-By:" ; RFC 2156
;; "Reply-To:" ; RFC 2822
+;; "Sender:" ;
;; "User-Agent:" ; Similar to X-Mailer, so display it.
-;;
-;; Keep fields alphabetized. Mention source, if known.
+;; "X-Mailer:" ;
+;; "X-Operator:" ; Similar to X-Mailer, so display it
+
+;; Keep fields alphabetized (set sort-fold-case to t first).
+;; Mention source, if known.
(defvar mh-invisible-header-fields-internal
'(
"Abuse-Reports-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "Accept-Language:"
+ "AcceptLanguage:"
"Accreditor:" ; Habeas
"Also-Control:" ; H. Spencer: News Article Format and Transmission, June 1994
"Alternate-recipient:" ; RFC 2156
"Auto-forwarded:" ; RFC 2156
"Autoforwarded:" ; RFC 2156
"Bestservhost:"
+ "Bytes:"
"Cancel-Key:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Cancel-Lock:" ; NNTP posts
"Comment:" ; Shows up with DomainKeys
"Control:" ; RFC 1036
"Conversion-With-Loss:" ; RFC 2156
"Conversion:" ; RFC 2156
- "DKIM-" ; http://antispam.yahoo.com/domainkeys
- "DL-Expansion-History:" ; RFC 2156
"Delivered-To:" ; Egroups/yahoogroups mailing list manager
"Delivery-Date:" ; RFC 2156
"Delivery:"
"Disposition-Notification-Options:" ; RFC 2298
"Disposition-Notification-To:" ; RFC 2298
"Distribution:" ; RFC 1036
+ "DKIM-" ; http://antispam.yahoo.com/domainkeys
+ "DL-Expansion-History:" ; RFC 2156
"DomainKey-" ; http://antispam.yahoo.com/domainkeys
+ "DomainKey-Signature:"
"Encoding:" ; RFC 1505
"Envelope-to:"
"Errors-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"List-" ; RFC 2369, 2919
"Mail-Copies-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Mail-Followup-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "Mail-Reply-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Mail-from:" ; MH
+ "Mail-Reply-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Mailing-List:" ; Egroups/yahoogroups mailing list manager
"Message-Content:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Message-Id:" ; RFC 822
"Message-Type:" ; RFC 2156
"Mime-Version" ; RFC 2045
+ "Msgid:"
"NNTP-" ; News
- "Newsgroups:" ; RFC 1036
"Obsoletes:" ; RFC 2156
"Old-Return-Path:"
"OpenPGP:"
"Original-Encoded-Information-Types:" ; RFC 2156
"Original-Lines:" ; mail to news
- "Original-NNTP-" ; mail to news
"Original-Newsgroups:" ; mail to news
+ "Original-NNTP-" ; mail to news
"Original-Path:" ; mail to news
"Original-Received:" ; mail to news
"Original-Recipt:" ; RFC 2298
"Return-Path:" ; RFC 822
"Return-Receipt-Requested:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Return-Receipt-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "See-Also:" ; H. Spencer: News Article Format and Transmission, June 1994
"Seal-Send-Time:"
+ "See-Also:" ; H. Spencer: News Article Format and Transmission, June 1994
"Sensitivity:" ; RFC 2156, 2421
"Speach-Act:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Status:" ; sendmail
"Supersedes:" ; H. Spencer: News Article Format and Transmission, June 1994
"Telefax:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Thread-"
+ "Thread-Index:"
+ "Thread-Topic:"
"Translated-By:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Translation-Of:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"Ua-Content-Id:" ; X400
"Via:" ; MH
- "X-AMAZON" ; Amazon.com
- "X-AOL-IP:" ; AOL WebMail
- "X-Abuse-Info:"
"X-Abuse-and-DMCA-"
- "X-Accept-Language:"
+ "X-Abuse-Info:"
"X-Accept-Language:" ; Netscape/Mozilla
"X-Ack:"
"X-Admin:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Administrivia-To:"
+ "X-AMAZON" ; Amazon.com
"X-AntiAbuse:" ; cPanel
"X-Antivirus-Scanner:"
+ "X-AOL-IP:" ; AOL WebMail
"X-Apparently-From:" ; MS Outlook
"X-Apparently-To:" ; Egroups/yahoogroups mailing list manager
"X-Attribution:"
"X-Authenticated-Info:" ; Verizon.net?
"X-Authenticated-Sender:" ; AT&T Message Center (webmail)
"X-Authentication-Warning:" ; sendmail
+ "X-Authority-Analysis:"
"X-Barracuda-" ; Barracuda spam scores
"X-Beenthere:" ; Mailman mailing list manager
"X-Bigfish:"
"X-Brightmail-Tracker:" ; Brightmail
"X-BrightmailFiltered:" ; Brightmail
"X-Bugzilla-" ; Bugzilla
+ "X-Campaignid:"
"X-Comment:" ; AT&T Mailennium
"X-Complaints-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Confirm-Reading-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "X-Content-Filtered-By:"
"X-ContentStamp:" ; NetZero
+ "X-Country-Chain:" ; http://www.declude.com/x-note.htm
"X-Cr-Hashedpuzzle:"
"X-Cr-Puzzleid:"
"X-Cron-Env:"
- "X-DMCA"
+ "X-DCC-Usenix-Metrics:"
+ "X-Declude-" ; http://www.declude.com/x-note.htm
+ "X-Dedicated:"
"X-Delivered"
+ "X-DH-Virus-"
+ "X-DMCA"
+ "X-Domain:"
+ "X-Echelon-Distraction"
"X-EFL-Spamscore:" ; MIT alumni spam filtering
+ "X-eGroups-" ; Egroups/yahoogroups mailing list manager
+ "X-EID:"
"X-ELNK-Trace:" ; Earthlink mailer
"X-Enigmail-Version:"
"X-Envelope-Date:" ; GNU mailutils
"X-Evolution:" ; Evolution mail client
"X-ExtLoop"
"X-Face:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "X-fmx-"
"X-Folder:" ; Spam
"X-From-Line"
"X-Gmail-" ; Gmail
"X-Gnus-Mail-Source:" ; gnus
"X-Google-" ; Google mail
+ "X-Google-Sender-Auth:"
"X-Greylist:" ; milter-greylist-1.2.1
- "X-HTTP-UserAgent:"
"X-Habeas-SWE-" ; Spam
"X-Hashcash:" ; hashcash
- "X-IMAP:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "X-HPL-"
+ "X-HR-"
+ "X-HTTP-UserAgent:"
+ "X-Hz" ; Hertz
+ "X-Identity:" ; http://www.declude.com/x-note.htm
"X-Image-URL:"
+ "X-IMAP:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Info:" ; NTMail
"X-IronPort-" ; IronPort AV
+ "X-ISI-4-30-3-MailScanner:"
+ "X-J2-"
"X-Juno-" ; Juno
+ "X-Key:"
"X-List-Host:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-List-Subscribe:" ; Unknown mailing list managers
"X-List-Unsubscribe:" ; Unknown mailing list managers
"X-Loop:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Lrde-Mailscanner:"
"X-Lumos-SenderID:" ; Roving ConstantContact
- "X-MAIL-INFO:" ; NetZero
- "X-MB-Message-" ; AOL WebMail
- "X-MHE-Checksum:" ; Checksum added during index search
- "X-MIME-Autoconverted:" ; sendmail
- "X-MIMEOLE:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/sendmail
- "X-MIMETrack:"
- "X-MS-" ; MS Outlook
- "X-MSMail-Priority" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Mail-from:" ; fastmail.fm
- "X-MailScanner" ; ListProc(tm) by CREN
+ "X-MAIL-INFO:" ; NetZero
+ "X-Mailer_"
"X-Mailing-List:" ; Unknown mailing list managers
"X-Mailman-Approved-At:" ; Mailman mailing list manager
"X-Mailman-Version:" ; Mailman mailing list manager
+ "X-MailScanner" ; ListProc(tm) by CREN
"X-Mailutils-Message-Id" ; GNU Mailutils
"X-Majordomo:" ; Majordomo mailing list manager
+ "X-MB-Message-" ; AOL WebMail
+ "X-MDaemon-Deliver-To:"
+ "X-MDRemoteIP:"
"X-Message-Id"
+ "X-Message-Type:"
"X-MessageWall-Score:" ; Unknown mailing list manager, AUC TeX
- "X-MimeOLE:" ; MS Outlook
+ "X-MHE-Checksum:" ; Checksum added during index search
+ "X-MIME-Autoconverted:" ; sendmail
+ "X-MIMEOLE:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/sendmail
+ "X-MIMETrack:"
"X-Mms-" ; T-Mobile pictures
"X-Mozilla-Status:" ; Netscape/Mozilla
+ "X-MS-" ; MS Outlook
"X-Msmail-" ; MS Outlook
+ "X-MSMail-Priority" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-NAI-Spam-" ; Network Associates Inc. SpamKiller
"X-News:" ; News
"X-Newsreader:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-No-Archive:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Notes-Item:" ; Lotus Notes Domino structured header
"X-OperatingSystem:"
+ "X-ORBL:"
"X-Orcl-Content-Type:"
+ "X-Organization:"
"X-Original-Arrival-Type:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Original-Complaints-To:"
"X-Original-Date:" ; SourceForge mailing list manager
"X-OriginalArrivalTime:" ; Hotmail
"X-Originating-Email:" ; Hotmail
"X-Originating-IP:" ; Hotmail
+ "X-pair-"
+ "X-PGP:"
+ "X-PID:"
"X-PMG-"
+ "X-PMX-Version:"
"X-Postfilter:"
"X-Priority:" ; MS Outlook
+ "X-Proofpoint-" ; Proofpoint mail filter
"X-Provags-ID:"
+ "X-PSTN-"
"X-Qotd-" ; User added
"X-RCPT-TO:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "X-RM"
"X-Received-Date:"
"X-Received:"
"X-Report-Abuse-To:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Request-"
"X-Resolved-to:" ; fastmail.fm
"X-Return-Path-Hint:" ; Roving ConstantContact
+ "X-RIM-" ; Research In Motion (i.e. BlackBerry)
+ "X-RM"
"X-RocketYMMF:" ; Yahoo
"X-Roving-" ; Roving ConstantContact
"X-SA-Exim-" ; Exim SpamAssassin
+ "X-Sasl-enc:" ; Apple Mail
"X-SBClass:" ; Spam
"X-SBNote:" ; Spam
"X-SBPass:" ; Spam
+ "X-SBRS:"
"X-SBRule:" ; Spam
- "X-SMTP-"
- "X-Sasl-enc:" ; Apple Mail
"X-Scanned-By:"
"X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-Server-Date:"
"X-Server-Uuid:"
+ "X-Service-Code:"
"X-Sieve:" ; Sieve filtering
+ "X-SMTP-"
"X-Source"
"X-Spam-" ; Spamassassin
"X-SpamBouncer:" ; Spam
+ "X-SPF-"
"X-Status"
+ "X-Submission-Address:"
"X-Submissions-To:"
+ "X-Sun-Charset:"
"X-Telecom-Digest"
"X-Trace:"
"X-UID"
"X-UIDL:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
+ "X-Unity"
"X-UNTD-" ; NetZero
"X-URI:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-URL:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
"X-USANET-" ; usa.net
- "X-Unity"
+ "X-Usenet-Provider"
"X-UserInfo1:"
- "X-VSMLoop:" ; NTMail
"X-Virus-" ;
"X-Vms-To:"
+ "X-VSMLoop:" ; NTMail
"X-WebTV-Signature:"
"X-Wss-Id:" ; Worldtalk gateways
"X-X-Sender:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/
- "X-YMail-"
"X-Yahoo"
- "X-eGroups-" ; Egroups/yahoogroups mailing list manager
- "X-pgp:"
- "X-submission-address:"
+ "X-Yahoo-Newman-"
+ "X-YMail-"
"X400-" ; X400
"Xref:" ; RFC 1036
)
:package-version '(MH-E . "8.0"))
(defcustom-mh mh-annotate-msg-hook nil
- "Hook run by `mh-annotate-msg' after annotation.
-Variables that are useful in this hook include `mh-current-folder',
-the current folder, and `mh-annotate-list', the messages annotated."
+ "Hook run whenever a message is sent and after the scan lines and message are annotated.
+Hook functions can access the current folder name with
+`mh-current-folder' and obtain the message numbers of the
+annotated messages with `mh-annotate-list'."
:type 'hook
:group 'mh-hooks
:group 'mh-sending-mail
HCoop / bpt / emacs.git / blobdiff