diff options
Diffstat (limited to 'lisp/mh-e/mh-e.el')
| -rw-r--r-- | lisp/mh-e/mh-e.el | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 2eb7fbaa20c..949787a2501 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1,4 +1,4 @@ -;;; mh-e.el --- GNU Emacs interface to the MH mail system +;;; mh-e.el --- GNU Emacs interface to the MH mail system -*- lexical-binding: t; -*- ;; Copyright (C) 1985-1988, 1990, 1992-1995, 1997, 1999-2021 Free ;; Software Foundation, Inc. @@ -229,7 +229,7 @@ User's mail folder directory.") (defvar mh-arrow-marker nil "Marker for arrow display in fringe.") -(defvar mh-blacklist nil +(defvar mh-blocklist nil "List of messages to use to train the junk filter. This variable can be used by `mh-before-commands-processed-hook'.") @@ -295,7 +295,7 @@ Elements have the form (SEQUENCE . MESSAGES).") "Stack of operations that change the folder view. These operations include narrowing or threading.") -(defvar mh-whitelist nil +(defvar mh-allowlist nil "List of messages to use to train the junk filter. This variable can be used by `mh-before-commands-processed-hook'.") @@ -522,7 +522,7 @@ parsed by MH-E." (let* ((initial-size (mh-truncate-log-buffer)) (start (point)) (args (mh-list-to-string args))) - (apply 'call-process (expand-file-name command mh-progs) nil t nil args) + (apply #'call-process (expand-file-name command mh-progs) nil t nil args) (when (> (buffer-size) initial-size) (save-excursion (goto-char start) @@ -560,7 +560,7 @@ ARGS are passed to COMMAND as command line arguments." (with-current-buffer (get-buffer-create mh-log-buffer) (mh-truncate-log-buffer)) (let* ((process-connection-type nil) - (process (apply 'start-process + (process (apply #'start-process command nil (expand-file-name command mh-progs) (mh-list-to-string args)))) @@ -602,7 +602,7 @@ RAISE-ERROR is non-nil, in which case an error is signaled if (set-buffer (get-buffer-create mh-temp-buffer)) (erase-buffer) (let ((value - (apply 'call-process + (apply #'call-process (expand-file-name command mh-progs) nil t nil args))) (goto-char (point-min)) @@ -616,7 +616,7 @@ Put the output into buffer after point. Set mark after inserted text. Output is expected to be shown to user, not parsed by MH-E." (push-mark (point) t) - (apply 'call-process + (apply #'call-process (expand-file-name command mh-progs) nil t display (mh-list-to-string args)) @@ -650,7 +650,7 @@ preserves whether the mark is active or not." "Execute MH library command COMMAND with ARGS. Put the output into buffer after point. Set mark after inserted text." - (apply 'mh-exec-cmd-output (expand-file-name command mh-lib-progs) nil args)) + (apply #'mh-exec-cmd-output (expand-file-name command mh-lib-progs) nil args)) (defun mh-handle-process-error (command status) "Raise error if COMMAND returned non-zero STATUS, otherwise return STATUS." @@ -695,9 +695,8 @@ See documentation for `defgroup' for a description of the arguments SYMBOL, MEMBERS, DOC and ARGS. This macro is used by Emacs versions that lack the :package-version keyword, introduced in Emacs 22." - (declare (doc-string 3)) + (declare (doc-string 3) (indent defun)) `(defgroup ,symbol ,members ,doc ,@(mh-strip-package-version args))) -(put 'defgroup-mh 'lisp-indent-function 'defun) (defmacro defcustom-mh (symbol value doc &rest args) "Declare SYMBOL as a customizable variable that defaults to VALUE. @@ -705,9 +704,8 @@ See documentation for `defcustom' for a description of the arguments SYMBOL, VALUE, DOC and ARGS. This macro is used by Emacs versions that lack the :package-version keyword, introduced in Emacs 22." - (declare (doc-string 3)) + (declare (doc-string 3) (indent defun)) `(defcustom ,symbol ,value ,doc ,@(mh-strip-package-version args))) -(put 'defcustom-mh 'lisp-indent-function 'defun) (defmacro defface-mh (face spec doc &rest args) "Declare FACE as a customizable face that defaults to SPEC. @@ -715,9 +713,8 @@ See documentation for `defface' for a description of the arguments FACE, SPEC, DOC and ARGS. This macro is used by Emacs versions that lack the :package-version keyword, introduced in Emacs 22." - (declare (doc-string 3)) + (declare (doc-string 3) (indent defun)) `(defface ,face ,spec ,doc ,@(mh-strip-package-version args))) -(put 'defface-mh 'lisp-indent-function 'defun) @@ -741,8 +738,11 @@ is described by the variable `mh-variants'." ;; Make a unique list of directories, keeping the given order. ;; We don't want the same MH variant to be listed multiple times. (cl-loop for dir in (append mh-path mh-sys-path exec-path) do - (setq dir (file-chase-links (directory-file-name dir))) - (cl-pushnew dir list-unique :test #'equal)) + ;; skip relative dirs, typically "." + (if (file-name-absolute-p dir) + (progn + (setq dir (file-chase-links (directory-file-name dir))) + (cl-pushnew dir list-unique :test #'equal)))) (cl-loop for dir in (nreverse list-unique) do (when (and dir (file-accessible-directory-p dir)) (let ((variant (mh-variant-info dir))) @@ -977,7 +977,7 @@ necessary and can actually cause problems." :set (lambda (symbol value) (set-default symbol value) ;Done in mh-variant-set-variant! (mh-variant-set value)) - :initialize 'custom-initialize-default + :initialize #'custom-initialize-default :group 'mh-e :package-version '(MH-E . "8.0")) @@ -1551,7 +1551,7 @@ as the result is undefined." '(radio) (mapcar (lambda (arg) `(const ,arg)) - (mapcar 'car mh-identity-list)))) + (mapcar #'car mh-identity-list)))) (cons :tag "Fcc Field" (const "fcc") (string :tag "Value")) @@ -1578,7 +1578,7 @@ See `mh-identity-list'." '(radio) (cons '(const :tag "None" nil) (mapcar (lambda (arg) `(const ,arg)) - (mapcar 'car mh-identity-list)))) + (mapcar #'car mh-identity-list)))) :group 'mh-identity :package-version '(MH-E . "7.1")) @@ -1687,13 +1687,13 @@ fashion." ;; Available spam filter interfaces (defvar mh-junk-function-alist - '((spamassassin mh-spamassassin-blacklist mh-spamassassin-whitelist) - (bogofilter mh-bogofilter-blacklist mh-bogofilter-whitelist) - (spamprobe mh-spamprobe-blacklist mh-spamprobe-whitelist)) + '((spamassassin mh-spamassassin-blocklist mh-spamassassin-allowlist) + (bogofilter mh-bogofilter-blocklist mh-bogofilter-allowlist) + (spamprobe mh-spamprobe-blocklist mh-spamprobe-allowlist)) "Available choices of spam programs to use. This is an alist. For each element there are functions that -blacklist a message as spam and whitelist a message incorrectly +blocklist a message as spam and allowlist a message incorrectly classified as spam.") (defun mh-junk-choose (symbol value) @@ -1718,8 +1718,8 @@ be slow when junking large numbers of messages. If you have enough memory or don't junk that many messages at the same time, you might try turning on this option. -Note that this option is used as the \"display\" argument in the -call to `call-process'. Therefore, turning on this option means +Note that this option is used as the \"destination\" argument in +the call to `call-process'. Therefore, turning on this option means setting its value to \"0\". You can also set its value to t to direct the programs' output to the \"*MH-E Log*\" buffer; this may be useful for debugging." @@ -1747,7 +1747,7 @@ bogofilter, then you can set this option to \"Bogofilter\"." (const :tag "SpamAssassin" spamassassin) (const :tag "Bogofilter" bogofilter) (const :tag "SpamProbe" spamprobe)) - :set 'mh-junk-choose + :set #'mh-junk-choose :group 'mh-junk :package-version '(MH-E . "7.3")) @@ -1910,7 +1910,7 @@ white image, can be generated using the \"compface\" command (see URL `ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.Z'). The \"Online X-Face Converter\" is a useful resource for quick conversion of images into \"X-Face:\" header fields (see URL -`http://www.dairiki.org/xface/'). +`https://www.dairiki.org/xface/'). Use the \"make-face\" script to convert a JPEG image to the higher resolution, color, \"Face:\" header field (see URL @@ -2008,7 +2008,7 @@ call `mh-set-cmd-note' with the width specified by your format file you would use \"(mh-set-cmd-note 4)\"." :type 'boolean :group 'mh-scan-line-formats - :set 'mh-adaptive-cmd-note-flag-check + :set #'mh-adaptive-cmd-note-flag-check :package-version '(MH-E . "7.0")) (defun mh-scan-format-file-check (symbol value) @@ -2047,7 +2047,7 @@ Emacs start with 0)." (const :tag "Use Default scan Format" nil) (file :tag "Specify a scan Format File")) :group 'mh-scan-line-formats - :set 'mh-scan-format-file-check + :set #'mh-scan-format-file-check :package-version '(MH-E . "6.0")) (defun mh-adaptive-cmd-note-flag-check (symbol value) @@ -2236,11 +2236,11 @@ commands." :group 'mh-sequences :package-version '(MH-E . "7.0")) -(defcustom-mh mh-whitelist-preserves-sequences-flag t - "Non-nil means that sequences are preserved when messages are whitelisted. +(defcustom-mh mh-allowlist-preserves-sequences-flag t + "Non-nil means that sequences are preserved when messages are allowlisted. If a message is in any sequence (except \"Previous-Sequence:\" -and \"cur\") when it is whitelisted, then it will still be in +and \"cur\") when it is allowlisted, then it will still be in those sequences in the destination folder. If this behavior is not desired, then turn off this option." :type 'boolean @@ -2469,9 +2469,9 @@ of citations entirely, choose \"None\"." "Disposition-Notification-Options:" ; RFC 2298 "Disposition-Notification-To:" ; RFC 2298 "Distribution:" ; RFC 1036 - "DKIM-" ; http://antispam.yahoo.com/domainkeys + "DKIM-" ; https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail "DL-Expansion-History:" ; RFC 2156 - "DomainKey-" ; http://antispam.yahoo.com/domainkeys + "DomainKey-" ; https://en.wikipedia.org/wiki/DomainKeys_Identified_Mail "DomainKey-Signature:" "Encoding:" ; RFC 1505 "Envelope-to:" @@ -2558,7 +2558,7 @@ of citations entirely, choose \"None\"." "X-Abuse-Info:" "X-Accept-Language:" ; Netscape/Mozilla "X-Ack:" - "X-ACL-Warn:" ; http://www.exim.org + "X-ACL-Warn:" ; https://www.exim.org "X-Admin:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Administrivia-To:" "X-AMAZON" ; Amazon.com @@ -2582,8 +2582,8 @@ of citations entirely, choose \"None\"." "X-BFI:" "X-Bigfish:" "X-Bogosity:" ; bogofilter - "X-BPS1:" ; http://www.boggletools.com - "X-BPS2:" ; http://www.boggletools.com + "X-BPS1:" ; http://www.boggletools.com [dead link?] + "X-BPS2:" ; http://www.boggletools.com [dead link?] "X-Brightmail-Tracker:" ; Brightmail "X-BrightmailFiltered:" ; Brightmail "X-Bugzilla-" ; Bugzilla @@ -2599,12 +2599,12 @@ of citations entirely, choose \"None\"." "X-Confirm-Reading-To:" ; https://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-Country-Chain:" ; http://www.declude.com/x-note.htm [dead link?] "X-Cr-Hashedpuzzle:" "X-Cr-Puzzleid:" "X-Cron-Env:" "X-DCC-" ; SpamAssassin - "X-Declude-" ; http://www.declude.com/x-note.htm + "X-Declude-" ; http://www.declude.com/x-note.htm [dead link?] "X-Dedicated:" "X-Delivered" "X-Destination-ID:" @@ -2619,7 +2619,7 @@ of citations entirely, choose \"None\"." "X-EID:" "X-ELNK-Trace:" ; Earthlink mailer "X-EM-" ; Some ecommerce software - "X-Email-Type-Id:" ; Paypal http://www.paypal.com + "X-Email-Type-Id:" ; Paypal https://www.paypal.com "X-Enigmail-Version:" "X-Envelope-Date:" ; GNU mailutils "X-Envelope-From:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ @@ -2635,21 +2635,21 @@ of citations entirely, choose \"None\"." "X-Folder:" ; Spam "X-Forwarded-" ; Google+ "X-From-Line" - "X-FuHaFi:" ; http://www.gmx.net/ + "X-FuHaFi:" ; https://www.gmx.net/ "X-Generated-By:" ; launchpad.net "X-Gmail-" ; Gmail "X-Gnus-Mail-Source:" ; gnus "X-Google-" ; Google mail "X-Google-Sender-Auth:" "X-Greylist:" ; milter-greylist-1.2.1 - "X-Habeas-" ; http://www.returnpath.net + "X-Habeas-" ; https://www.returnpath.net "X-Hashcash:" ; hashcash "X-Headers-End:" ; SpamCop "X-HPL-" "X-HR-" "X-HTTP-UserAgent:" "X-Hz" ; Hertz - "X-Identity:" ; http://www.declude.com/x-note.htm + "X-Identity:" ; http://www.declude.com/x-note.htm [dead link?] "X-IEEE-UCE-" ; IEEE spam filter "X-Image-URL:" "X-IMAP:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ @@ -2670,7 +2670,7 @@ of citations entirely, choose \"None\"." "X-Loop:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ "X-Lrde-Mailscanner:" "X-Lumos-SenderID:" ; Roving ConstantContact - "X-mail_abuse_inquiries:" ; http://www.salesforce.com + "X-mail_abuse_inquiries:" ; https://www.salesforce.com "X-Mail-from:" ; fastmail.fm "X-MAIL-INFO:" ; NetZero "X-Mailer_" @@ -2683,11 +2683,11 @@ of citations entirely, choose \"None\"." "X-Mailutils-Message-Id" ; GNU Mailutils "X-Majordomo:" ; Majordomo mailing list manager "X-Match:" - "X-MaxCode-Template:" ; Paypal http://www.paypal.com + "X-MaxCode-Template:" ; Paypal https://www.paypal.com "X-MB-Message-" ; AOL WebMail "X-MDaemon-Deliver-To:" "X-MDRemoteIP:" - "X-ME-Bayesian:" ; http://www.newmediadevelopment.net/page.cfm/parent/Client-Area/content/Managing-spam/ + "X-ME-Bayesian:" ; https://www.newmediadevelopment.net/page.cfm/parent/Client-Area/content/Managing-spam/ "X-Message-Id" "X-Message-Type:" "X-MessageWall-Score:" ; Unknown mailing list manager, AUC TeX @@ -2758,7 +2758,7 @@ of citations entirely, choose \"None\"." "X-Server-Date:" "X-Server-Uuid:" "X-Service-Code:" - "X-SFDC-" ; http://www.salesforce.com + "X-SFDC-" ; https://www.salesforce.com "X-Sieve:" ; Sieve filtering "X-SMFBL:" "X-SMHeaderMap:" @@ -2773,7 +2773,7 @@ of citations entirely, choose \"None\"." "X-Submissions-To:" "X-Sun-Charset:" "X-Telecom-Digest" - "X-TM-IMSS-Message-ID:" ; http://www.trendmicro.com + "X-TM-IMSS-Message-ID:" ; https://www.trendmicro.com "X-Trace:" "X-UID" "X-UIDL:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ @@ -2793,10 +2793,10 @@ of citations entirely, choose \"None\"." "X-WebTV-Signature:" "X-Wss-Id:" ; Worldtalk gateways "X-X-Sender:" ; https://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "X-XPT-XSL-Name:" ; Paypal http://www.paypal.com + "X-XPT-XSL-Name:" ; Paypal https://www.paypal.com "X-xsi-" - "X-XWALL-" ; http://www.dataenter.co.at/doc/xwall_undocumented_config.htm - "X-Y-GMX-Trusted:" ; http://www.gmx.net/ + "X-XWALL-" ; https://www.dataenter.co.at/doc/xwall_undocumented_config.htm + "X-Y-GMX-Trusted:" ; https://www.gmx.net/ "X-Yahoo" "X-Yahoo-Newman-" "X-YMail-" @@ -3042,7 +3042,7 @@ XEmacs. For more information, see URL `ftp://ftp.cs.indiana.edu/pub/faces/compface/compface.tar.z'). Recent versions of XEmacs have internal support for \"X-Face:\" images. If your version of XEmacs does not, then you'll need both \"uncompface\" -and the x-face package (see URL `http://www.jpl.org/ftp/pub/elisp/'). +and the x-face package (see URL `https://www.jpl.org/ftp/pub/elisp/'). Finally, MH-E will display images referenced by the \"X-Image-URL:\" header field if neither the \"Face:\" nor the \"X-Face:\" fields are @@ -3195,7 +3195,7 @@ annotated messages with `mh-annotate-list'." "Hook run by \\<mh-folder-mode-map>\\[mh-execute-commands] before performing outstanding refile and delete requests. Variables that are useful in this hook include `mh-delete-list', -`mh-refile-list', `mh-blacklist', and `mh-whitelist' which can be +`mh-refile-list', `mh-blocklist', and `mh-allowlist' which can be used to see which changes will be made to the current folder, `mh-current-folder'." :type 'hook @@ -3227,8 +3227,8 @@ before sending, add the `ispell-message' function." :group 'mh-letter :package-version '(MH-E . "6.0")) -(defcustom-mh mh-blacklist-msg-hook nil - "Hook run by \\<mh-letter-mode-map>\\[mh-junk-blacklist] after marking each message for blacklisting." +(defcustom-mh mh-blocklist-msg-hook nil + "Hook run by \\<mh-letter-mode-map>\\[mh-junk-blocklist] after marking each message for blocklisting." :type 'hook :group 'mh-hooks :group 'mh-show @@ -3400,8 +3400,8 @@ sequence." :group 'mh-sequences :package-version '(MH-E . "6.0")) -(defcustom-mh mh-whitelist-msg-hook nil - "Hook run by \\<mh-letter-mode-map>\\[mh-junk-whitelist] after marking each message for whitelisting." +(defcustom-mh mh-allowlist-msg-hook nil + "Hook run by \\<mh-letter-mode-map>\\[mh-junk-allowlist] after marking each message for allowlisting." :type 'hook :group 'mh-hooks :group 'mh-show @@ -3627,9 +3627,9 @@ specified colors." :group 'mh-folder :package-version '(MH-E . "8.0")) -(defface-mh mh-folder-blacklisted +(defface-mh mh-folder-blocklisted (mh-face-data 'mh-folder-msg-number '((t (:inherit mh-folder-msg-number)))) - "Blacklisted message face." + "Blocklisted message face." :group 'mh-faces :group 'mh-folder :package-version '(MH-E . "8.4")) @@ -3723,9 +3723,9 @@ format `mh-scan-format-nmh' and the regular expression :group 'mh-folder :package-version '(MH-E . "8.0")) -(defface-mh mh-folder-whitelisted +(defface-mh mh-folder-allowlisted (mh-face-data 'mh-folder-refiled '((t (:inherit mh-folder-refiled)))) - "Whitelisted message face." + "Allowlisted message face." :group 'mh-faces :group 'mh-folder :package-version '(MH-E . "8.4")) |