diff options
Diffstat (limited to 'lisp/mh-e')
| -rw-r--r-- | lisp/mh-e/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | lisp/mh-e/mh-acros.el | 35 | ||||
| -rw-r--r-- | lisp/mh-e/mh-alias.el | 27 | ||||
| -rw-r--r-- | lisp/mh-e/mh-buffers.el | 4 | ||||
| -rw-r--r-- | lisp/mh-e/mh-comp.el | 26 | ||||
| -rw-r--r-- | lisp/mh-e/mh-compat.el | 10 | ||||
| -rw-r--r-- | lisp/mh-e/mh-e.el | 122 | ||||
| -rw-r--r-- | lisp/mh-e/mh-folder.el | 131 | ||||
| -rw-r--r-- | lisp/mh-e/mh-funcs.el | 10 | ||||
| -rw-r--r-- | lisp/mh-e/mh-gnus.el | 6 | ||||
| -rw-r--r-- | lisp/mh-e/mh-identity.el | 14 | ||||
| -rw-r--r-- | lisp/mh-e/mh-inc.el | 20 | ||||
| -rw-r--r-- | lisp/mh-e/mh-junk.el | 225 | ||||
| -rw-r--r-- | lisp/mh-e/mh-letter.el | 17 | ||||
| -rw-r--r-- | lisp/mh-e/mh-limit.el | 6 | ||||
| -rw-r--r-- | lisp/mh-e/mh-mime.el | 60 | ||||
| -rw-r--r-- | lisp/mh-e/mh-print.el | 9 | ||||
| -rw-r--r-- | lisp/mh-e/mh-scan.el | 40 | ||||
| -rw-r--r-- | lisp/mh-e/mh-search.el | 78 | ||||
| -rw-r--r-- | lisp/mh-e/mh-seq.el | 30 | ||||
| -rw-r--r-- | lisp/mh-e/mh-show.el | 23 | ||||
| -rw-r--r-- | lisp/mh-e/mh-speed.el | 16 | ||||
| -rw-r--r-- | lisp/mh-e/mh-thread.el | 40 | ||||
| -rw-r--r-- | lisp/mh-e/mh-tool-bar.el | 8 | ||||
| -rw-r--r-- | lisp/mh-e/mh-utils.el | 32 | ||||
| -rw-r--r-- | lisp/mh-e/mh-xface.el | 6 |
26 files changed, 462 insertions, 535 deletions
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index f1aeca65479..b0fdd02e3b3 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -11196,7 +11196,7 @@ instead of "0 msgs". Do not try to print a range when there are no messages. * mh-e.el (mh-regenerate-headers): Bug fix. Catch and remove the - "scan: band message list" message. + "scan: bad message list" message. 2001-11-13 Jeffrey C Honig <jch@honig.net> diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el index af6f2f1ab02..8fdcf3c62b4 100644 --- a/lisp/mh-e/mh-acros.el +++ b/lisp/mh-e/mh-acros.el @@ -1,4 +1,4 @@ -;;; mh-acros.el --- macros used in MH-E +;;; mh-acros.el --- macros used in MH-E -*- lexical-binding: t; -*- ;; Copyright (C) 2004, 2006-2021 Free Software Foundation, Inc. @@ -36,8 +36,6 @@ ;; because it's pointless to compile a file full of macros. But we ;; kept the name. -;;; Change Log: - ;;; Code: (require 'cl-lib) @@ -49,20 +47,19 @@ ;;;###mh-autoload (defmacro mh-do-in-gnu-emacs (&rest body) "Execute BODY if in GNU Emacs." - (declare (debug t)) + (declare (debug t) (indent defun)) (unless (featurep 'xemacs) `(progn ,@body))) -(put 'mh-do-in-gnu-emacs 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-do-in-xemacs (&rest body) "Execute BODY if in XEmacs." - (declare (debug t)) + (declare (debug t) (indent defun)) (when (featurep 'xemacs) `(progn ,@body))) -(put 'mh-do-in-xemacs 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-funcall-if-exists (function &rest args) "Call FUNCTION with ARGS as parameters if it exists." + (declare (debug (symbolp body))) ;; FIXME: Not clear when this should be used. If the function happens ;; not to exist at compile-time (e.g. because the corresponding package ;; wasn't loaded), then it won't ever be used :-( @@ -75,25 +72,24 @@ "Create function NAME. If FUNCTION exists, then NAME becomes an alias for FUNCTION. Otherwise, create function NAME with ARG-LIST and BODY." + (declare (indent defun) (doc-string 4) + (debug (&define name symbolp sexp def-body))) `(defalias ',name (if (fboundp ',function) ',function (lambda ,arg-list ,@body)))) -(put 'defun-mh 'lisp-indent-function 'defun) -(put 'defun-mh 'doc-string-elt 4) ;;;###mh-autoload (defmacro defmacro-mh (name macro arg-list &rest body) "Create macro NAME. If MACRO exists, then NAME becomes an alias for MACRO. Otherwise, create macro NAME with ARG-LIST and BODY." + (declare (indent defun) (doc-string 4) + (debug (&define name symbolp sexp def-body))) (let ((defined-p (fboundp macro))) (if defined-p `(defalias ',name ',macro) `(defmacro ,name ,arg-list ,@body)))) -(put 'defmacro-mh 'lisp-indent-function 'defun) -(put 'defmacro-mh 'doc-string-elt 4) - ;;; Miscellaneous @@ -127,7 +123,7 @@ Execute BODY, which can modify the folder buffer without having to worry about file locking or the read-only flag, and return its result. If SAVE-MODIFICATION-FLAG is non-nil, the buffer's modification flag is unchanged, otherwise it is cleared." - (declare (debug t)) + (declare (debug t) (indent defun)) (setq save-modification-flag (car save-modification-flag)) ; CL style `(prog1 (let ((mh-folder-updating-mod-flag (buffer-modified-p)) @@ -139,14 +135,13 @@ is unchanged, otherwise it is cleared." (mh-set-folder-modified-p mh-folder-updating-mod-flag))) ,@(if (not save-modification-flag) '((mh-set-folder-modified-p nil))))) -(put 'with-mh-folder-updating 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-in-show-buffer (show-buffer &rest body) "Format is (mh-in-show-buffer (SHOW-BUFFER) &body BODY). Display buffer SHOW-BUFFER in other window and execute BODY in it. Stronger than `save-excursion', weaker than `save-window-excursion'." - (declare (debug t)) + (declare (debug t) (indent defun)) (setq show-buffer (car show-buffer)) ; CL style `(let ((mh-in-show-buffer-saved-window (selected-window))) (switch-to-buffer-other-window ,show-buffer) @@ -155,7 +150,6 @@ Stronger than `save-excursion', weaker than `save-window-excursion'." (progn ,@body) (select-window mh-in-show-buffer-saved-window)))) -(put 'mh-in-show-buffer 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-do-at-event-location (event &rest body) @@ -163,7 +157,7 @@ Stronger than `save-excursion', weaker than `save-window-excursion'." After BODY has been executed return to original window. The modification flag of the buffer in the event window is preserved." - (declare (debug t)) + (declare (debug t) (indent defun)) (let ((event-window (make-symbol "event-window")) (event-position (make-symbol "event-position")) (original-window (make-symbol "original-window")) @@ -190,7 +184,6 @@ preserved." (goto-char ,original-position) (set-marker ,original-position nil) (select-window ,original-window)))))) -(put 'mh-do-at-event-location 'lisp-indent-hook 'defun) @@ -209,7 +202,7 @@ VAR is bound to the message on the current line as we loop starting from BEGIN till END. In each step BODY is executed. If VAR is nil then the loop is executed without any binding." - (declare (debug (symbolp body))) + (declare (debug (symbolp body)) (indent defun)) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var)) @@ -221,7 +214,6 @@ If VAR is nil then the loop is executed without any binding." (let ,(if binding-needed-flag `((,var (mh-get-msg-num t))) ()) ,@body)) (forward-line 1))))) -(put 'mh-iterate-on-messages-in-region 'lisp-indent-hook 'defun) ;;;###mh-autoload (defmacro mh-iterate-on-range (var range &rest body) @@ -235,7 +227,7 @@ a string. In each iteration, BODY is executed. The parameter RANGE is usually created with `mh-interactive-range' in order to provide a uniform interface to MH-E functions." - (declare (debug (symbolp body))) + (declare (debug (symbolp body)) (indent defun)) (unless (symbolp var) (error "Can not bind the non-symbol %s" var)) (let ((binding-needed-flag var) @@ -263,7 +255,6 @@ MH-E functions." (when (gethash v ,seq-hash-table) (let ,(if binding-needed-flag `((,var v)) ()) ,@body)))))))) -(put 'mh-iterate-on-range 'lisp-indent-hook 'defun) (defmacro mh-dlet* (binders &rest body) "Like `let*' but always dynamically scoped." diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index 012725cab60..37fdb166011 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -1,4 +1,4 @@ -;;; mh-alias.el --- MH-E mail alias completion and expansion +;;; mh-alias.el --- MH-E mail alias completion and expansion -*- lexical-binding: t; -*- ;; Copyright (C) 1994-1997, 2001-2021 Free Software Foundation, Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -42,8 +40,8 @@ "Time aliases were last loaded.") (defvar mh-alias-read-address-map (let ((map (copy-keymap minibuffer-local-completion-map))) - (define-key map "," 'mh-alias-minibuffer-confirm-address) - (define-key map " " 'self-insert-command) + (define-key map "," #'mh-alias-minibuffer-confirm-address) + (define-key map " " #'self-insert-command) map)) (defcustom mh-alias-system-aliases @@ -113,10 +111,10 @@ COMMA-SEPARATOR is non-nil." (string-match "^\\([^,]+\\)," res)) (setq res (match-string 1 res))) ;; Replace "&" with capitalized username - (if (string-match "&" res) + (if (string-search "&" res) (setq res (mh-replace-regexp-in-string "&" (capitalize username) res))) ;; Remove " character - (if (string-match "\"" res) + (if (string-search "\"" res) (setq res (mh-replace-regexp-in-string "\"" "" res))) ;; If empty string, use username instead (if (string-equal "" res) @@ -270,9 +268,9 @@ Blind aliases or users from /etc/passwd are not expanded." (t (split-string (completing-read prompt mh-alias-alist nil nil) ","))))) (if (not mh-alias-expand-aliases-flag) - (mapconcat 'identity the-answer ", ") + (mapconcat #'identity the-answer ", ") ;; Loop over all elements, checking if in passwd alias or blind first - (mapconcat 'mh-alias-expand the-answer ",\n "))))) + (mapconcat #'mh-alias-expand the-answer ",\n "))))) ;;;###mh-autoload (defun mh-alias-minibuffer-confirm-address () @@ -287,7 +285,7 @@ Blind aliases or users from /etc/passwd are not expanded." (message "%s -> %s" the-name (mh-alias-expand the-name)) ;; Check if it was a single word likely to be an alias (if (and (equal mh-alias-flash-on-comma 1) - (not (string-match " " the-name))) + (not (string-search " " the-name))) (message "No alias for %s" the-name)))))) (self-insert-command 1)) @@ -427,10 +425,10 @@ contains it." (if (or (not alias) (string-equal alias (mh-alias-ali alias))) ;alias doesn't exist (completing-read "Alias file: " - (mapcar 'list mh-alias-insert-file) nil t) + (mapcar #'list mh-alias-insert-file) nil t) (or (mh-alias-which-file-has-alias alias mh-alias-insert-file) (completing-read "Alias file: " - (mapcar 'list mh-alias-insert-file) nil t))))) + (mapcar #'list mh-alias-insert-file) nil t))))) ((and mh-alias-insert-file (stringp mh-alias-insert-file)) mh-alias-insert-file) (t @@ -449,11 +447,10 @@ set `mh-alias-insert-file' or the \"Aliasfile:\" profile component")) (car autolist)) ((or (not alias) (string-equal alias (mh-alias-ali alias))) ;alias doesn't exist - (completing-read "Alias file: " (mapcar 'list autolist) nil t)) + (completing-read "Alias file: " autolist nil t)) (t (or (mh-alias-which-file-has-alias alias autolist) - (completing-read "Alias file: " - (mapcar 'list autolist) nil t)))))))) + (completing-read "Alias file: " autolist nil t)))))))) ;;;###mh-autoload (defun mh-alias-address-to-alias (address) diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el index 55f74b6585d..ef21fdb2f95 100644 --- a/lisp/mh-e/mh-buffers.el +++ b/lisp/mh-e/mh-buffers.el @@ -1,4 +1,4 @@ -;;; mh-buffers.el --- MH-E buffer constants and utilities +;;; mh-buffers.el --- MH-E buffer constants and utilities -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: ;; The names of ephemeral buffers have a " *mh-" prefix (so that they diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 0dedb7e0ad0..4fae69defaf 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -1,4 +1,4 @@ -;;; mh-comp.el --- MH-E functions for composing and sending messages +;;; mh-comp.el --- MH-E functions for composing and sending messages -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -29,8 +29,6 @@ ;; that are used to send the mail. Other that those, functions that ;; are needed in mh-letter.el should be found there. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -639,8 +637,8 @@ See also `mh-compose-forward-as-mime-flag', (defun mh-forwarded-letter-subject (from subject) "Return a Subject suitable for a forwarded message. Original message has headers FROM and SUBJECT." - (let ((addr-start (string-match "<" from)) - (comment (string-match "(" from))) + (let ((addr-start (string-search "<" from)) + (comment (string-search "(" from))) (cond ((and addr-start (> addr-start 0)) ;; Full Name <luser@host> (setq from (substring from 0 (1- addr-start)))) @@ -719,12 +717,14 @@ message and scan line." (mh-insert-fields field value))))) (mh-components-to-list components-file)) (delete-file components-file)) - (mh-insert-fields "Resent-To:" (mapconcat 'identity (list to comp-to) ", ") - "Resent-Cc:" (mapconcat 'identity (list cc comp-cc) ", ") - "Resent-Fcc:" (mapconcat 'identity (list fcc - comp-fcc) ", ") - "Resent-Bcc:" (mapconcat 'identity (list bcc - comp-bcc) ", ") + (mh-insert-fields "Resent-To:" (mapconcat #'identity (list to comp-to) + ", ") + "Resent-Cc:" (mapconcat #'identity (list cc comp-cc) + ", ") + "Resent-Fcc:" (mapconcat #'identity (list fcc comp-fcc) + ", ") + "Resent-Bcc:" (mapconcat #'identity (list bcc comp-bcc) + ", ") "Resent-From:" from) (save-buffer) (message "Redistributing...") @@ -1096,7 +1096,7 @@ letter." (setq mode-line-buffer-identification (list " {%b}")) (mh-logo-display) (mh-make-local-hook 'kill-buffer-hook) - (add-hook 'kill-buffer-hook 'mh-tidy-draft-buffer nil t) + (add-hook 'kill-buffer-hook #'mh-tidy-draft-buffer nil t) (run-hook-with-args 'mh-compose-letter-function to subject cc)) (defun mh-insert-x-mailer () @@ -1165,7 +1165,7 @@ This should be the last function called when composing the draft." MSG can be a message number, a list of message numbers, or a sequence. The hook `mh-annotate-msg-hook' is run after annotating; see its documentation for variables it can use." - (apply 'mh-exec-cmd "anno" folder + (apply #'mh-exec-cmd "anno" folder (if (listp msg) (append msg args) (cons msg args))) (save-excursion (cond ((get-buffer folder) ; Buffer may be deleted diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 07bf03b30ee..ade80e8b95e 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -1,4 +1,4 @@ -;;; mh-compat.el --- make MH-E compatible with various versions of Emacs +;;; mh-compat.el --- make MH-E compatible with various versions of Emacs -*- lexical-binding: t; -*- ;; Copyright (C) 2006-2021 Free Software Foundation, Inc. @@ -23,8 +23,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: ;; This is a good place to gather code that is used for compatibility @@ -42,7 +40,7 @@ (eval-when-compile (require 'mh-acros)) (mh-do-in-gnu-emacs - (defalias 'mh-require 'require)) + (defalias 'mh-require #'require)) (mh-do-in-xemacs (defun mh-require (feature &optional filename noerror) @@ -83,6 +81,7 @@ This is an analogue of a dynamically scoped `let' that operates on the function cell of FUNCs rather than their value cell. \(fn ((FUNC ARGLIST BODY...) ...) FORM...)" + (declare (indent 1) (debug ((&rest (sexp sexp &rest form)) &rest form))) (if (fboundp 'cl-letf) `(cl-letf ,(mapcar (lambda (binding) `((symbol-function ',(car binding)) @@ -90,9 +89,6 @@ the function cell of FUNCs rather than their value cell. bindings) ,@body) `(flet ,bindings ,@body))) -(put 'mh-flet 'lisp-indent-function 1) -(put 'mh-flet 'edebug-form-spec - '((&rest (sexp sexp &rest form)) &rest form)) (defun mh-display-color-cells (&optional display) "Return the number of color cells supported by DISPLAY. 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")) diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el index 555d13d7235..35277ae46a1 100644 --- a/lisp/mh-e/mh-folder.el +++ b/lisp/mh-e/mh-folder.el @@ -1,4 +1,4 @@ -;;; mh-folder.el --- MH-Folder mode +;;; mh-folder.el --- MH-Folder mode -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. @@ -25,8 +25,6 @@ ;; Mode for browsing folders -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -209,10 +207,10 @@ annotation.") ;; Use defalias to make sure the documented primary key bindings ;; appear in menu lists. -(defalias 'mh-alt-show 'mh-show) -(defalias 'mh-alt-refile-msg 'mh-refile-msg) -(defalias 'mh-alt-send 'mh-send) -(defalias 'mh-alt-visit-folder 'mh-visit-folder) +(defalias 'mh-alt-show #'mh-show) +(defalias 'mh-alt-refile-msg #'mh-refile-msg) +(defalias 'mh-alt-send #'mh-send) +(defalias 'mh-alt-visit-folder #'mh-visit-folder) ;; Save the "b" binding for a future `back'. Maybe? (gnus-define-keys mh-folder-mode-map @@ -280,7 +278,8 @@ annotation.") (gnus-define-keys (mh-junk-map "J" mh-folder-mode-map) "?" mh-prefix-help - "b" mh-junk-blacklist + "a" mh-junk-allowlist + "b" mh-junk-blocklist "w" mh-junk-whitelist) (gnus-define-keys (mh-ps-print-map "P" mh-folder-mode-map) @@ -388,7 +387,7 @@ annotation.") (?K "[v]iew, [i]nline, with [e]xternal viewer; \n" "[o]utput/save MIME part; save [a]ll parts; \n" "[t]oggle buttons; [TAB] next; [SHIFT-TAB] previous") - (?J "[b]lacklist, [w]hitelist message")) + (?J "[b]locklist, [a]llowlist message")) "Key binding cheat sheet. See `mh-set-help'.") @@ -407,12 +406,12 @@ See `mh-set-help'.") ;; Marked for deletion (list (concat mh-scan-deleted-msg-regexp ".*") '(0 'mh-folder-deleted)) - ;; Marked for blacklisting - (list (concat mh-scan-blacklisted-msg-regexp ".*") - '(0 'mh-folder-blacklisted)) - ;; Marked for whitelisting - (list (concat mh-scan-whitelisted-msg-regexp ".*") - '(0 'mh-folder-whitelisted)) + ;; Marked for blocklisting + (list (concat mh-scan-blocklisted-msg-regexp ".*") + '(0 'mh-folder-blocklisted)) + ;; Marked for allowlisting + (list (concat mh-scan-allowlisted-msg-regexp ".*") + '(0 'mh-folder-allowlisted)) ;; After subject (list mh-scan-body-regexp '(1 'mh-folder-body nil t)) @@ -618,8 +617,8 @@ perform the operation on all messages in that region. 'mh-showing-mode nil ; Show message also? 'mh-refile-list nil ; List of folder names in mh-seq-list 'mh-delete-list nil ; List of msgs nums to delete - 'mh-blacklist nil ; List of messages to process as spam - 'mh-whitelist nil ; List of messages to process as ham + 'mh-blocklist nil ; List of messages to process as spam + 'mh-allowlist nil ; List of messages to process as ham 'mh-seq-list nil ; Alist of (seq . msgs) nums 'mh-seen-list nil ; List of displayed messages 'mh-next-direction 'forward ; Direction to move to next message @@ -650,11 +649,11 @@ perform the operation on all messages in that region. (auto-save-mode -1) (setq buffer-offer-save t) (mh-make-local-hook (mh-write-file-functions)) - (add-hook (mh-write-file-functions) 'mh-execute-commands nil t) + (add-hook (mh-write-file-functions) #'mh-execute-commands nil t) (make-local-variable 'revert-buffer-function) (make-local-variable 'hl-line-mode) ; avoid pollution (mh-funcall-if-exists hl-line-mode 1) - (setq revert-buffer-function 'mh-undo-folder) + (setq revert-buffer-function #'mh-undo-folder) (add-to-list 'minor-mode-alist '(mh-showing-mode " Show")) (mh-do-in-xemacs (easy-menu-add mh-folder-sequence-menu) @@ -716,8 +715,8 @@ RANGE is read in interactive use." (defun mh-execute-commands () "Perform outstanding operations\\<mh-folder-mode-map>. -If you've marked messages to be refiled, deleted, blacklisted, or -whitelisted and you want to go ahead and perform these operations +If you've marked messages to be refiled, deleted, blocklisted, or +allowlisted and you want to go ahead and perform these operations on these messages, use this command. Many MH-E commands that may affect the numbering of the messages (such as \\[mh-rescan-folder] or \\[mh-pack-folder]) will ask if you want @@ -1117,7 +1116,7 @@ called interactively." (message "Destination folder: %s" (cdr mh-last-destination))) (t (mh-iterate-on-range msg range - (apply 'mh-write-msg-to-file msg (cdr mh-last-destination))) + (apply #'mh-write-msg-to-file msg (cdr mh-last-destination))) (mh-next-msg interactive-flag)))) ;;;###mh-autoload @@ -1190,16 +1189,16 @@ RANGE is read in interactive use." (beginning-of-line) (while (not (or (looking-at mh-scan-refiled-msg-regexp) (looking-at mh-scan-deleted-msg-regexp) - (looking-at mh-scan-blacklisted-msg-regexp) - (looking-at mh-scan-whitelisted-msg-regexp) + (looking-at mh-scan-blocklisted-msg-regexp) + (looking-at mh-scan-allowlisted-msg-regexp) (and (eq mh-next-direction 'forward) (bobp)) (and (eq mh-next-direction 'backward) (save-excursion (forward-line) (eobp))))) (forward-line (if (eq mh-next-direction 'forward) -1 1))) (if (or (looking-at mh-scan-refiled-msg-regexp) (looking-at mh-scan-deleted-msg-regexp) - (looking-at mh-scan-blacklisted-msg-regexp) - (looking-at mh-scan-whitelisted-msg-regexp)) + (looking-at mh-scan-blocklisted-msg-regexp) + (looking-at mh-scan-allowlisted-msg-regexp)) (progn (mh-undo-msg (mh-get-msg-num t)) (mh-maybe-show)) @@ -1531,7 +1530,7 @@ is updated." (save-excursion (when (eq major-mode 'mh-show-mode) (set-buffer mh-show-folder-buffer)) - (or mh-delete-list mh-refile-list mh-blacklist mh-whitelist))) + (or mh-delete-list mh-refile-list mh-blocklist mh-allowlist))) ;;;###mh-autoload (defun mh-set-folder-modified-p (flag) @@ -1557,12 +1556,12 @@ after the commands are processed." (folders-changed (list mh-current-folder)) (seq-map (and (or (and mh-refile-list mh-refile-preserves-sequences-flag) - (and mh-whitelist - mh-whitelist-preserves-sequences-flag)) + (and mh-allowlist + mh-allowlist-preserves-sequences-flag)) (mh-create-sequence-map mh-seq-list))) (dest-map (and mh-refile-list mh-refile-preserves-sequences-flag (make-hash-table))) - (white-map (and mh-whitelist mh-whitelist-preserves-sequences-flag + (allow-map (and mh-allowlist mh-allowlist-preserves-sequences-flag (make-hash-table)))) ;; Remove invalid scan lines if we are in an index folder and then remove ;; the real messages @@ -1606,53 +1605,53 @@ after the commands are processed." ;; Now delete messages (cond (mh-delete-list (setq redraw-needed-flag t) - (apply 'mh-exec-cmd "rmm" folder + (apply #'mh-exec-cmd "rmm" folder (mh-coalesce-msg-list mh-delete-list)) (mh-delete-scan-msgs mh-delete-list) (setq mh-delete-list nil))) - ;; Blacklist messages. - (when mh-blacklist - (let ((msg-list (mh-coalesce-msg-list mh-blacklist)) - (dest (mh-junk-blacklist-disposition))) - (mh-junk-process-blacklist mh-blacklist) + ;; Blocklist messages. + (when mh-blocklist + (let ((msg-list (mh-coalesce-msg-list mh-blocklist)) + (dest (mh-junk-blocklist-disposition))) + (mh-junk-process-blocklist mh-blocklist) ;; TODO I wonder why mh-exec-cmd is used instead of the following: ;; (mh-refile-a-msg nil (intern dest)) ;; (mh-delete-a-msg nil))) (if (null dest) - (apply 'mh-exec-cmd "rmm" folder msg-list) - (apply 'mh-exec-cmd "refile" "-src" folder dest msg-list) + (apply #'mh-exec-cmd "rmm" folder msg-list) + (apply #'mh-exec-cmd "refile" "-src" folder dest msg-list) (push dest folders-changed)) (setq redraw-needed-flag t) - (mh-delete-scan-msgs mh-blacklist) - (setq mh-blacklist nil))) + (mh-delete-scan-msgs mh-blocklist) + (setq mh-blocklist nil))) - ;; Whitelist messages. - (when mh-whitelist - (let ((msg-list (mh-coalesce-msg-list mh-whitelist)) + ;; Allowlist messages. + (when mh-allowlist + (let ((msg-list (mh-coalesce-msg-list mh-allowlist)) (last (car (mh-translate-range mh-inbox "last")))) - (mh-junk-process-whitelist mh-whitelist) + (mh-junk-process-allowlist mh-allowlist) (apply #'mh-exec-cmd "refile" "-src" folder mh-inbox msg-list) (push mh-inbox folders-changed) (setq redraw-needed-flag t) - (mh-delete-scan-msgs mh-whitelist) - (when mh-whitelist-preserves-sequences-flag - (clrhash white-map) + (mh-delete-scan-msgs mh-allowlist) + (when mh-allowlist-preserves-sequences-flag + (clrhash allow-map) (cl-loop for i from (1+ (or last 0)) - for msg in (sort (copy-sequence mh-whitelist) #'<) + for msg in (sort (copy-sequence mh-allowlist) #'<) do (cl-loop for seq-name in (gethash msg seq-map) - do (push i (gethash seq-name white-map)))) + do (push i (gethash seq-name allow-map)))) (maphash #'(lambda (seq msgs) ;; Can't be run in background, since the current ;; folder is changed by mark this could lead to a - ;; race condition with the next refile/whitelist. + ;; race condition with the next refile/allowlist. (apply #'mh-exec-cmd "mark" "-sequence" (symbol-name seq) mh-inbox "-add" (mapcar #'(lambda(x) (format "%s" x)) (mh-coalesce-msg-list msgs)))) - white-map)) - (setq mh-whitelist nil))) + allow-map)) + (setq mh-allowlist nil))) ;; Don't need to remove sequences since delete and refile do so. ;; Mark cur message @@ -1703,7 +1702,7 @@ after the commands are processed." (mh-recenter nil))) ;;;###mh-autoload -(defun mh-make-folder-mode-line (&optional ignored) +(defun mh-make-folder-mode-line (&optional _ignored) "Set the fields of the mode line for a folder buffer. The optional argument is now obsolete and IGNORED. It used to be used to pass in what is now stored in the buffer-local variable @@ -1963,10 +1962,10 @@ once when he kept statistics on his mail usage." (setq message (mh-get-msg-num t))) (if (looking-at mh-scan-refiled-msg-regexp) (error "Message %d is refiled; undo refile before deleting" message)) - (if (looking-at mh-scan-blacklisted-msg-regexp) - (error "Message %d is blacklisted; undo before deleting" message)) - (if (looking-at mh-scan-whitelisted-msg-regexp) - (error "Message %d is whitelisted; undo before deleting" message)) + (if (looking-at mh-scan-blocklisted-msg-regexp) + (error "Message %d is blocklisted; undo before deleting" message)) + (if (looking-at mh-scan-allowlisted-msg-regexp) + (error "Message %d is allowlisted; undo before deleting" message)) (if (looking-at mh-scan-deleted-msg-regexp) nil (mh-set-folder-modified-p t) @@ -1988,10 +1987,10 @@ be refiled." (setq message (mh-get-msg-num t))) (cond ((looking-at mh-scan-deleted-msg-regexp) (error "Message %d is deleted; undo delete before moving" message)) - ((looking-at mh-scan-blacklisted-msg-regexp) - (error "Message %d is blacklisted; undo before moving" message)) - ((looking-at mh-scan-whitelisted-msg-regexp) - (error "Message %d is whitelisted; undo before moving" message)) + ((looking-at mh-scan-blocklisted-msg-regexp) + (error "Message %d is blocklisted; undo before moving" message)) + ((looking-at mh-scan-allowlisted-msg-regexp) + (error "Message %d is allowlisted; undo before moving" message)) ((looking-at mh-scan-refiled-msg-regexp) (if (y-or-n-p (format "Message %d already refiled; copy to %s as well? " @@ -2010,7 +2009,7 @@ be refiled." (run-hooks 'mh-refile-msg-hook))))) (defun mh-undo-msg (msg) - "Undo the deletion, refile, black- or whitelisting of one MSG. + "Undo the deletion, refile, block- or allowlisting of one MSG. If MSG is nil then act on the message at point" (save-excursion (if (numberp msg) @@ -2019,10 +2018,10 @@ If MSG is nil then act on the message at point" (setq msg (mh-get-msg-num t))) (cond ((memq msg mh-delete-list) (setq mh-delete-list (delq msg mh-delete-list))) - ((memq msg mh-blacklist) - (setq mh-blacklist (delq msg mh-blacklist))) - ((memq msg mh-whitelist) - (setq mh-whitelist (delq msg mh-whitelist))) + ((memq msg mh-blocklist) + (setq mh-blocklist (delq msg mh-blocklist))) + ((memq msg mh-allowlist) + (setq mh-allowlist (delq msg mh-allowlist))) (t (dolist (folder-msg-list mh-refile-list) (setf (cdr folder-msg-list) (remove msg (cdr folder-msg-list)))) diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el index 309bcb4b49f..4a5e670c1ef 100644 --- a/lisp/mh-e/mh-funcs.el +++ b/lisp/mh-e/mh-funcs.el @@ -1,4 +1,4 @@ -;;; mh-funcs.el --- MH-E functions not everyone will use right away +;;; mh-funcs.el --- MH-E functions not everyone will use right away -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. @@ -30,8 +30,6 @@ ;; small support routines are needed, place them with the function; ;; otherwise, create a separate section for them. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -348,7 +346,7 @@ See `mh-store-msg' for a description of DIRECTORY." (error "Error occurred during execution of %s" command))))) ;;;###mh-autoload -(defun mh-undo-folder (&rest ignored) +(defun mh-undo-folder (&rest _ignored) "Undo all refiles and deletes in the current folder. Arguments are IGNORED (for `revert-buffer')." (interactive) @@ -356,8 +354,8 @@ Arguments are IGNORED (for `revert-buffer')." (yes-or-no-p "Undo all commands in folder? ")) (setq mh-delete-list nil mh-refile-list nil - mh-blacklist nil - mh-whitelist nil + mh-blocklist nil + mh-allowlist nil mh-seq-list nil mh-next-direction 'forward) (with-mh-folder-updating (nil) diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el index 6a9851662ab..cc60f7b6640 100644 --- a/lisp/mh-e/mh-gnus.el +++ b/lisp/mh-e/mh-gnus.el @@ -1,4 +1,4 @@ -;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus +;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus -*- lexical-binding: t; -*- ;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -129,7 +127,7 @@ (unless default (setq default (mml-content-disposition type filename))) (let ((disposition (completing-read - (format "Disposition (default %s): " default) + (format-prompt "Disposition" default) '(("attachment") ("inline") ("")) nil t nil nil default))) (if (not (equal disposition "")) diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el index 18443992177..ceede0d07cb 100644 --- a/lisp/mh-e/mh-identity.el +++ b/lisp/mh-e/mh-identity.el @@ -1,4 +1,4 @@ -;;; mh-identity.el --- multiple identify support for MH-E +;;; mh-identity.el --- multiple identify support for MH-E -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. @@ -33,8 +33,6 @@ ;; in MH-Letter mode. The command `mh-insert-identity' can be used ;; to manually insert an identity. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -50,7 +48,7 @@ This is normally set as part of an Identity in (defvar mh-identity-menu nil "The Identity menu.") -(defalias 'mh-identity-make-menu-no-autoload 'mh-identity-make-menu) +(defalias 'mh-identity-make-menu-no-autoload #'mh-identity-make-menu) ;;;###mh-autoload (defun mh-identity-make-menu () @@ -74,7 +72,7 @@ See `mh-identity-add-menu'." (mapcar (lambda (arg) `[,arg (mh-insert-identity ,arg) :style radio :selected (equal mh-identity-local ,arg)]) - (mapcar 'car mh-identity-list)) + (mapcar #'car mh-identity-list)) '(["None" (mh-insert-identity "None") :style radio :selected (not mh-identity-local)] @@ -142,7 +140,7 @@ See `mh-identity-list'." (completing-read "Identity: " (cons '("None") - (mapcar 'list (mapcar 'car mh-identity-list))) + (mapcar #'list (mapcar #'car mh-identity-list))) nil t default nil default)) (if (eq identity "None") nil @@ -171,8 +169,8 @@ See `mh-identity-list'." "Identity: " (if mh-identity-local (cons '("None") - (mapcar 'list (mapcar 'car mh-identity-list))) - (mapcar 'list (mapcar 'car mh-identity-list))) + (mapcar #'list (mapcar #'car mh-identity-list))) + (mapcar #'list (mapcar #'car mh-identity-list))) nil t) nil)) diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el index 32f731799b9..83cfe4f99f1 100644 --- a/lisp/mh-e/mh-inc.el +++ b/lisp/mh-e/mh-inc.el @@ -1,4 +1,4 @@ -;;; mh-inc.el --- MH-E "inc" and separate mail spool handling +;;; mh-inc.el --- MH-E "inc" and separate mail spool handling -*- lexical-binding: t; -*- ;; Copyright (C) 2003-2004, 2006-2021 Free Software Foundation, Inc. @@ -28,8 +28,6 @@ ;; inc can also be used to incorporate mail from multiple spool files ;; into separate folders. See "C-h v mh-inc-spool-list". -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -58,19 +56,15 @@ (mh-inc-spool-generator folder spool) (mh-inc-spool-def-key key folder)))))) -(defalias 'mh-inc-spool-make-no-autoload 'mh-inc-spool-make) +(defalias 'mh-inc-spool-make-no-autoload #'mh-inc-spool-make) (defun mh-inc-spool-generator (folder spool) "Create a command to inc into FOLDER from SPOOL file." - (let ((folder1 (make-symbol "folder")) - (spool1 (make-symbol "spool"))) - (set folder1 folder) - (set spool1 spool) - (setf (symbol-function (intern (concat "mh-inc-spool-" folder))) - `(lambda () - ,(format "Inc spool file %s into folder %s." spool folder) - (interactive) - (mh-inc-folder ,spool1 (concat "+" ,folder1)))))) + (defalias (symbol-function (intern (concat "mh-inc-spool-" folder))) + (lambda () + (:documentation (format "Inc spool file %s into folder %s." spool folder)) + (interactive) + (mh-inc-folder spool (concat "+" folder))))) (defun mh-inc-spool-def-key (key folder) "Define a KEY in `mh-inc-spool-map' to inc FOLDER and collect help string." diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el index b49c6322492..6c3674811b0 100644 --- a/lisp/mh-e/mh-junk.el +++ b/lisp/mh-e/mh-junk.el @@ -1,4 +1,4 @@ -;;; mh-junk.el --- MH-E interface to anti-spam measures +;;; mh-junk.el --- MH-E interface to anti-spam measures -*- lexical-binding: t; -*- ;; Copyright (C) 2003-2021 Free Software Foundation, Inc. @@ -26,16 +26,14 @@ ;; Spam handling in MH-E. -;;; Change Log: - ;;; Code: (require 'mh-e) (require 'mh-scan) ;;;###mh-autoload -(defun mh-junk-blacklist (range) - "Blacklist RANGE as spam. +(defun mh-junk-blocklist (range) + "Blocklist RANGE as spam. This command trains the spam program in use (see the option `mh-junk-program') with the content of RANGE and then handles the @@ -47,44 +45,44 @@ read in interactive use. For more information about using your particular spam fighting program, see: - - `mh-spamassassin-blacklist' - - `mh-bogofilter-blacklist' - - `mh-spamprobe-blacklist'" - (interactive (list (mh-interactive-range "Blacklist"))) - (mh-iterate-on-range () range (mh-blacklist-a-msg nil)) - (if (looking-at mh-scan-blacklisted-msg-regexp) + - `mh-spamassassin-blocklist' + - `mh-bogofilter-blocklist' + - `mh-spamprobe-blocklist'" + (interactive (list (mh-interactive-range "Blocklist"))) + (mh-iterate-on-range () range (mh-junk-blocklist-a-msg nil)) + (if (looking-at mh-scan-blocklisted-msg-regexp) (mh-next-msg))) -(defun mh-blacklist-a-msg (message) - "Blacklist MESSAGE. -If MESSAGE is nil then the message at point is blacklisted. -The hook `mh-blacklist-msg-hook' is called after you mark a message -for blacklisting." +(defun mh-junk-blocklist-a-msg (message) + "Blocklist MESSAGE. +If MESSAGE is nil then the message at point is blocklisted. +The hook `mh-blocklist-msg-hook' is called after you mark a message +for blocklisting." (save-excursion (if (numberp message) (mh-goto-msg message nil t) (beginning-of-line) (setq message (mh-get-msg-num t))) (cond ((looking-at mh-scan-refiled-msg-regexp) - (error "Message %d is refiled; undo refile before blacklisting" + (error "Message %d is refiled; undo refile before blocklisting" message)) ((looking-at mh-scan-deleted-msg-regexp) - (error "Message %d is deleted; undo delete before blacklisting" + (error "Message %d is deleted; undo delete before blocklisting" message)) - ((looking-at mh-scan-whitelisted-msg-regexp) - (error "Message %d is whitelisted; undo before blacklisting" + ((looking-at mh-scan-allowlisted-msg-regexp) + (error "Message %d is allowlisted; undo before blocklisting" message)) - ((looking-at mh-scan-blacklisted-msg-regexp) nil) + ((looking-at mh-scan-blocklisted-msg-regexp) nil) (t (mh-set-folder-modified-p t) - (setq mh-blacklist (cons message mh-blacklist)) + (setq mh-blocklist (cons message mh-blocklist)) (if (not (memq message mh-seen-list)) (setq mh-seen-list (cons message mh-seen-list))) - (mh-notate nil mh-note-blacklisted mh-cmd-note) - (run-hooks 'mh-blacklist-msg-hook))))) + (mh-notate nil mh-note-blocklisted mh-cmd-note) + (run-hooks 'mh-blocklist-msg-hook))))) ;;;###mh-autoload -(defun mh-junk-blacklist-disposition () +(defun mh-junk-blocklist-disposition () "Determines the fate of the selected spam." (cond ((null mh-junk-disposition) nil) ((equal mh-junk-disposition "") "+") @@ -96,73 +94,76 @@ for blacklisting." (t (concat "+" mh-junk-disposition)))) ;;;###mh-autoload -(defun mh-junk-process-blacklist (range) - "Blacklist RANGE as spam. +(defun mh-junk-process-blocklist (range) + "Blocklist RANGE as spam. This command trains the spam program in use (see the option `mh-junk-program') with the content of RANGE and then handles the message(s) as specified by the option `mh-junk-disposition'." - (let ((blacklist-func (nth 1 (assoc mh-junk-choice mh-junk-function-alist)))) - (unless blacklist-func + (let ((blocklist-func (nth 1 (assoc mh-junk-choice mh-junk-function-alist)))) + (unless blocklist-func (error "Customize `mh-junk-program' appropriately")) (mh-iterate-on-range msg range - (message "Blacklisting message %d..." msg) - (funcall (symbol-function blacklist-func) msg) - (message "Blacklisting message %d...done" msg)))) + (funcall (symbol-function blocklist-func) msg)))) ;;;###mh-autoload (defun mh-junk-whitelist (range) - "Whitelist RANGE as ham. + "Old name for `mh-junk-allowlist'; use \\[mh-junk-allowlist] instead." + (declare (obsolete mh-junk-allowlist "28.1")) + (interactive (list (mh-interactive-range "Allowlist"))) + (mh-junk-allowlist range)) -This command reclassifies the RANGE as ham if it were incorrectly +;;;###mh-autoload +(defun mh-junk-allowlist (range) + "Allowlist RANGE as ham. + +This command reclassifies the RANGE as ham if it has been incorrectly classified as spam (see the option `mh-junk-program'). It then refiles the message into the \"+inbox\" folder. Check the documentation of `mh-interactive-range' to see how RANGE is read in interactive use." - (interactive (list (mh-interactive-range "Whitelist"))) - (mh-iterate-on-range () range (mh-junk-whitelist-a-msg nil)) - (if (looking-at mh-scan-whitelisted-msg-regexp) + (interactive (list (mh-interactive-range "Allowlist"))) + (mh-iterate-on-range () range (mh-junk-allowlist-a-msg nil)) + (if (looking-at mh-scan-allowlisted-msg-regexp) (mh-next-msg))) -(defun mh-junk-whitelist-a-msg (message) - "Whitelist MESSAGE. -If MESSAGE is nil then the message at point is whitelisted. The -hook `mh-whitelist-msg-hook' is called after you mark a message -for whitelisting." +(defun mh-junk-allowlist-a-msg (message) + "Allowlist MESSAGE. +If MESSAGE is nil then the message at point is allowlisted. The +hook `mh-allowlist-msg-hook' is called after you mark a message +for allowlisting." (save-excursion (if (numberp message) (mh-goto-msg message nil t) (beginning-of-line) (setq message (mh-get-msg-num t))) (cond ((looking-at mh-scan-refiled-msg-regexp) - (error "Message %d is refiled; undo refile before whitelisting" + (error "Message %d is refiled; undo refile before allowlisting" message)) ((looking-at mh-scan-deleted-msg-regexp) - (error "Message %d is deleted; undo delete before whitelisting" + (error "Message %d is deleted; undo delete before allowlisting" message)) - ((looking-at mh-scan-blacklisted-msg-regexp) - (error "Message %d is blacklisted; undo before whitelisting" + ((looking-at mh-scan-blocklisted-msg-regexp) + (error "Message %d is blocklisted; undo before allowlisting" message)) - ((looking-at mh-scan-whitelisted-msg-regexp) nil) + ((looking-at mh-scan-allowlisted-msg-regexp) nil) (t (mh-set-folder-modified-p t) - (setq mh-whitelist (cons message mh-whitelist)) - (mh-notate nil mh-note-whitelisted mh-cmd-note) - (run-hooks 'mh-whitelist-msg-hook))))) + (setq mh-allowlist (cons message mh-allowlist)) + (mh-notate nil mh-note-allowlisted mh-cmd-note) + (run-hooks 'mh-allowlist-msg-hook))))) ;;;###mh-autoload -(defun mh-junk-process-whitelist (range) - "Whitelist RANGE as ham. +(defun mh-junk-process-allowlist (range) + "Allowlist RANGE as ham. This command reclassifies the RANGE as ham if it were incorrectly classified as spam (see the option `mh-junk-program')." - (let ((whitelist-func (nth 2 (assoc mh-junk-choice mh-junk-function-alist)))) - (unless whitelist-func + (let ((allowlist-func (nth 2 (assoc mh-junk-choice mh-junk-function-alist)))) + (unless allowlist-func (error "Customize `mh-junk-program' appropriately")) (mh-iterate-on-range msg range - (message "Whitelisting message %d..." msg) - (funcall (symbol-function whitelist-func) msg) - (message "Whitelisting message %d...done" msg)))) + (funcall (symbol-function allowlist-func) msg)))) @@ -172,12 +173,12 @@ classified as spam (see the option `mh-junk-program')." (defvar mh-sa-learn-executable (executable-find "sa-learn")) ;;;###mh-autoload -(defun mh-spamassassin-blacklist (msg) - "Blacklist MSG with SpamAssassin. +(defun mh-spamassassin-blocklist (msg) + "Blocklist MSG with SpamAssassin. SpamAssassin is one of the more popular spam filtering programs. Get it from your local distribution or from the SpamAssassin web -site at URL `http://spamassassin.org/'. +site at URL `https://spamassassin.apache.org/'. To use SpamAssassin, add the following recipes to \".procmailrc\": @@ -198,7 +199,7 @@ To use SpamAssassin, add the following recipes to * ^X-Spam-Status: Yes spam/. -If you don't use \"spamc\", use \"spamassassin -P -a\". +If you don't use \"spamc\", use \"spamassassin\". Note that one of the recipes above throws away messages with a score greater than or equal to 10. Here's how you can determine a @@ -221,22 +222,22 @@ rules-based filters is a plethora of false positives so it is worthwhile to check. If SpamAssassin classifies a message incorrectly, or is unsure, -you can use the MH-E commands \\[mh-junk-blacklist] and -\\[mh-junk-whitelist]. +you can use the MH-E commands \\[mh-junk-blocklist] and +\\[mh-junk-allowlist]. -The command \\[mh-junk-blacklist] adds a \"blacklist_from\" entry +The command \\[mh-junk-blocklist] adds a \"blacklist_from\" entry to \"~/spamassassin/user_prefs\", deletes the message, and sends the message to the Razor, so that others might not see this spam. If the \"sa-learn\" command is available, the message is also recategorized as spam. -The command \\[mh-junk-whitelist] adds a \"whitelist_from\" rule +The command \\[mh-junk-allowlist] adds a \"whitelist_from\" rule to the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\" command is available, the message is also recategorized as ham. Over time, you'll observe that the same host or domain occurs repeatedly in the \"blacklist_from\" entries, so you might think -that you could avoid future spam by blacklisting all mail from a +that you could avoid future spam by blocklisting all mail from a particular domain. The utility function `mh-spamassassin-identify-spammers' helps you do precisely that. This function displays a frequency count of the hosts and domains @@ -245,35 +246,26 @@ in the \"blacklist_from\" entries from the last blank line in information can be used so that you can replace multiple \"blacklist_from\" entries with a single wildcard entry such as: - blacklist_from *@*amazingoffersdirect2u.com - -In versions of SpamAssassin (2.50 and on) that support a Bayesian -classifier, \\[mh-junk-blacklist] uses the program \"sa-learn\" -to recategorize the message as spam. Neither MH-E, nor -SpamAssassin, rebuilds the database after adding words, so you -will need to run \"sa-learn --rebuild\" periodically. This can be -done by adding the following to your crontab: - - 0 * * * * sa-learn --rebuild > /dev/null 2>&1" + blacklist_from *@*amazingoffersdirect2u.com" (unless mh-spamassassin-executable (error "Unable to find the spamassassin executable")) (let ((current-folder mh-current-folder) (msg-file (mh-msg-filename msg mh-current-folder)) (sender)) - (message "Reporting message %d..." msg) + (message "Reporting message %d as spam with spamassassin..." msg) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-spamassassin-executable msg-file mh-junk-background nil - ;;"--report" "--remove-from-whitelist" - "-r" "-R") ; spamassassin V2.20 + ;; -R removes from allowlist + "--report" "-R") (when mh-sa-learn-executable - (message "Recategorizing message %d as spam..." msg) + (message "Recategorizing message %d as spam with sa-learn..." msg) (mh-truncate-log-buffer) (call-process mh-sa-learn-executable msg-file mh-junk-background nil - "--single" "--spam" "--local" "--no-rebuild"))) - (message "Blacklisting sender of message %d..." msg) + "--spam" "--local" "--no-sync"))) + (message "Blocklisting sender of message %d..." msg) (with-current-buffer (get-buffer-create mh-temp-buffer) (erase-buffer) (call-process (expand-file-name mh-scan-prog mh-progs) @@ -285,18 +277,18 @@ done by adding the following to your crontab: (progn (setq sender (match-string 0)) (mh-spamassassin-add-rule "blacklist_from" sender) - (message "Blacklisting sender of message %d...done" msg)) - (message "Blacklisting sender of message %d...not done (from my address)" msg))))) + (message "Blocklisting sender of message %d...done" msg)) + (message "Blocklisting sender of message %d...not done (from my address)" msg))))) ;;;###mh-autoload -(defun mh-spamassassin-whitelist (msg) - "Whitelist MSG with SpamAssassin. +(defun mh-spamassassin-allowlist (msg) + "Allowlist MSG with SpamAssassin. -The \\[mh-junk-whitelist] command adds a \"whitelist_from\" rule to +The \\[mh-junk-allowlist] command adds a \"whitelist_from\" rule to the \"~/.spamassassin/user_prefs\" file. If the \"sa-learn\" command is available, the message is also recategorized as ham. -See `mh-spamassassin-blacklist' for more information." +See `mh-spamassassin-blocklist' for more information." (unless mh-spamassassin-executable (error "Unable to find the spamassassin executable")) (let ((msg-file (mh-msg-filename msg mh-current-folder)) @@ -306,27 +298,28 @@ See `mh-spamassassin-blacklist' for more information." (erase-buffer) (message "Removing spamassassin markup from message %d..." msg) (call-process mh-spamassassin-executable msg-file t nil - ;; "--remove-markup" - "-d") ; spamassassin V2.20 + "--remove-markup") (if show-buffer (kill-buffer show-buffer)) (write-file msg-file) (when mh-sa-learn-executable - (message "Recategorizing message %d as ham..." msg) + (message "Recategorizing message %d as ham with sa-learn..." msg) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-sa-learn-executable msg-file mh-junk-background nil - "--single" "--ham" "--local" "--no-rebuild"))) - (message "Whitelisting sender of message %d..." msg) + "--ham" "--local" "--no-sync"))) + (message "Allowlisting sender of message %d..." msg) (setq from (car (mh-funcall-if-exists ietf-drums-parse-address (mh-get-header-field "From:")))) (kill-buffer nil) - (unless (or (null from) (equal from "")) - (mh-spamassassin-add-rule "whitelist_from" from)) - (message "Whitelisting sender of message %d...done" msg)))) + (if (or (null from) (equal from "")) + (message "Allowlisting sender of message %d...%s" + msg "not done (cannot identify sender)") + (mh-spamassassin-add-rule "whitelist_from" from) + (message "Allowlisting sender of message %d...done" msg))))) (defun mh-spamassassin-add-rule (rule body) "Add a new rule to \"~/.spamassassin/user_prefs\". @@ -396,8 +389,8 @@ information can be used so that you can replace multiple (defvar mh-bogofilter-executable (executable-find "bogofilter")) ;;;###mh-autoload -(defun mh-bogofilter-blacklist (msg) - "Blacklist MSG with bogofilter. +(defun mh-bogofilter-blocklist (msg) + "Blocklist MSG with bogofilter. Bogofilter is a Bayesian spam filtering program. Get it from your local distribution or from the bogofilter web site at URL @@ -434,7 +427,7 @@ To use bogofilter, add the following recipes to \".procmailrc\": spam/unsure/. If bogofilter classifies a message incorrectly, or is unsure, you can -use the MH-E commands \\[mh-junk-blacklist] and \\[mh-junk-whitelist] +use the MH-E commands \\[mh-junk-blocklist] and \\[mh-junk-allowlist] to update bogofilter's training. The \"Bogofilter FAQ\" suggests that you run the following @@ -447,28 +440,32 @@ occasionally to shrink the database: The \"Bogofilter tuning HOWTO\" describes how you can fine-tune Bogofilter." (unless mh-bogofilter-executable (error "Unable to find the bogofilter executable")) + (message "Blocklisting message %d with bogofilter..." msg) (let ((msg-file (mh-msg-filename msg mh-current-folder))) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-bogofilter-executable msg-file mh-junk-background - nil "-s")))) + nil "-s") + (message "Blocklisting message %d with bogofilter...done" msg)))) ;;;###mh-autoload -(defun mh-bogofilter-whitelist (msg) - "Whitelist MSG with bogofilter. +(defun mh-bogofilter-allowlist (msg) + "Allowlist MSG with bogofilter. -See `mh-bogofilter-blacklist' for more information." +See `mh-bogofilter-blocklist' for more information." (unless mh-bogofilter-executable (error "Unable to find the bogofilter executable")) + (message "Allowlisting message %d with bogofilter..." msg) (let ((msg-file (mh-msg-filename msg mh-current-folder))) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-bogofilter-executable msg-file mh-junk-background - nil "-n")))) + nil "-n") + (message "Allowlisting message %d with bogofilter...done" msg)))) @@ -477,8 +474,8 @@ See `mh-bogofilter-blacklist' for more information." (defvar mh-spamprobe-executable (executable-find "spamprobe")) ;;;###mh-autoload -(defun mh-spamprobe-blacklist (msg) - "Blacklist MSG with SpamProbe. +(defun mh-spamprobe-blocklist (msg) + "Blocklist MSG with SpamProbe. SpamProbe is a Bayesian spam filtering program. Get it from your local distribution or from the SpamProbe web site at URL @@ -501,32 +498,36 @@ To use SpamProbe, add the following recipes to \".procmailrc\": spam/. If SpamProbe classifies a message incorrectly, you can use the -MH-E commands \\[mh-junk-blacklist] and \\[mh-junk-whitelist] to +MH-E commands \\[mh-junk-blocklist] and \\[mh-junk-allowlist] to update SpamProbe's training." (unless mh-spamprobe-executable (error "Unable to find the spamprobe executable")) + (message "Blocklisting message %d with spamprobe..." msg) (let ((msg-file (mh-msg-filename msg mh-current-folder))) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-spamprobe-executable msg-file mh-junk-background - nil "spam")))) + nil "spam") + (message "Blocklisting message %d with spamprobe...done" msg)))) ;;;###mh-autoload -(defun mh-spamprobe-whitelist (msg) - "Whitelist MSG with SpamProbe. +(defun mh-spamprobe-allowlist (msg) + "Allowlist MSG with SpamProbe. -See `mh-spamprobe-blacklist' for more information." +See `mh-spamprobe-blocklist' for more information." (unless mh-spamprobe-executable (error "Unable to find the spamprobe executable")) + (message "Allowlisting message %d with spamprobe..." msg) (let ((msg-file (mh-msg-filename msg mh-current-folder))) (mh-truncate-log-buffer) ;; Put call-process output in log buffer if we are saving it ;; (this happens if mh-junk-background is t). (with-current-buffer mh-log-buffer (call-process mh-spamprobe-executable msg-file mh-junk-background - nil "good")))) + nil "good") + (message "Allowlisting message %d with spamprobe...done" msg)))) (provide 'mh-junk) diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el index f5ad73d800d..ae5b80d5807 100644 --- a/lisp/mh-e/mh-letter.el +++ b/lisp/mh-e/mh-letter.el @@ -1,4 +1,4 @@ -;;; mh-letter.el --- MH-Letter mode +;;; mh-letter.el --- MH-Letter mode -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -31,8 +31,6 @@ ;; mh-utils.el. That will help prevent the loading of this file until ;; a message is actually composed. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -334,15 +332,15 @@ order). ;; Maybe we want to use the existing Mail menu from mail-mode in ;; 9.0; in the mean time, let's remove it since the redundancy will ;; only produce confusion. - (define-key mh-letter-mode-map [menu-bar mail] 'undefined) + (define-key mh-letter-mode-map [menu-bar mail] #'undefined) (mh-do-in-xemacs (easy-menu-remove mail-menubar-menu)) (setq fill-column mh-letter-fill-column) (add-hook 'completion-at-point-functions - 'mh-letter-completion-at-point nil 'local) + #'mh-letter-completion-at-point nil 'local) ;; If text-mode-hook turned on auto-fill, tune it for messages (when auto-fill-function (make-local-variable 'auto-fill-function) - (setq auto-fill-function 'mh-auto-fill-for-letter))) + (setq auto-fill-function #'mh-auto-fill-for-letter))) @@ -390,10 +388,7 @@ This command leaves the mark before the letter and point after it." (or mh-sent-from-msg (nth 0 (mh-translate-range folder "cur"))) (nth 0 (mh-translate-range folder "cur")))) (message - (read-string (concat "Message number" - (or (and default - (format " (default %d): " default)) - ": ")) + (read-string (format-prompt "Message number" default) nil nil (if (numberp default) (int-to-string default) @@ -851,7 +846,7 @@ body." (forward-line))))) ;;;###mh-autoload -(defun mh-position-on-field (field &optional ignored) +(defun mh-position-on-field (field &optional _ignored) "Move to the end of the FIELD in the header. Move to end of entire header if FIELD not found. Returns non-nil if FIELD was found. diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el index 036522f3ddd..39cf7c5d271 100644 --- a/lisp/mh-e/mh-limit.el +++ b/lisp/mh-e/mh-limit.el @@ -1,4 +1,4 @@ -;;; mh-limit.el --- MH-E display limits +;;; mh-limit.el --- MH-E display limits -*- lexical-binding: t; -*- ;; Copyright (C) 2001-2003, 2006-2021 Free Software Foundation, Inc. @@ -25,8 +25,6 @@ ;; "Poor man's threading" by psg. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -237,7 +235,7 @@ Return number of messages put in the sequence: (setq list (cons (mh-get-msg-num t) list))) (if (assoc 'subject mh-seq-list) (mh-delete-seq 'subject)) ;; sort the result into a sequence - (let ((sorted-list (sort (copy-sequence list) 'mh-lessp))) + (let ((sorted-list (sort (copy-sequence list) #'mh-lessp))) (while sorted-list (mh-add-msgs-to-seq (car sorted-list) 'subject nil) (setq sorted-list (cdr sorted-list))) diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el index 70df9e6b0f2..ef702525b7b 100644 --- a/lisp/mh-e/mh-mime.el +++ b/lisp/mh-e/mh-mime.el @@ -1,4 +1,4 @@ -;;; mh-mime.el --- MH-E MIME support +;;; mh-mime.el --- MH-E MIME support -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. @@ -36,8 +36,6 @@ ;; MIME option to mh-forward command to move to content-description ;; insertion point. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -190,9 +188,9 @@ Set from last use.") ;; XEmacs doesn't care. (set-keymap-parent map mh-show-mode-map)) (mh-do-in-gnu-emacs - (define-key map [mouse-2] 'mh-push-button)) + (define-key map [mouse-2] #'mh-push-button)) (mh-do-in-xemacs - (define-key map '(button2) 'mh-push-button)) + (define-key map '(button2) #'mh-push-button)) (dolist (c mh-mime-button-commands) (define-key map (cadr c) (car c))) map)) @@ -214,11 +212,11 @@ Set from last use.") (let ((map (make-sparse-keymap))) (unless (>= (string-to-number emacs-version) 21) (set-keymap-parent map mh-show-mode-map)) - (define-key map "\r" 'mh-press-button) + (define-key map "\r" #'mh-press-button) (mh-do-in-gnu-emacs - (define-key map [mouse-2] 'mh-push-button)) + (define-key map [mouse-2] #'mh-push-button)) (mh-do-in-xemacs - (define-key map '(button2) 'mh-push-button)) + (define-key map '(button2) #'mh-push-button)) map)) @@ -259,9 +257,7 @@ usually reads the file \"/etc/mailcap\"." (methods (mapcar (lambda (x) (list (cdr (assoc 'viewer x)))) (mailcap-mime-info type 'all))) (def (caar methods)) - (prompt (format "Viewer%s: " (if def - (format " (default %s)" def) - ""))) + (prompt (format-prompt "Viewer" def)) (method (completing-read prompt methods nil nil nil nil def)) (folder mh-show-folder-buffer) (buffer-read-only nil)) @@ -395,9 +391,9 @@ do the work." ((and (or prompt (equal t mh-mime-save-parts-default-directory)) mh-mime-save-parts-directory) - (read-directory-name (format - "Store in directory (default %s): " - mh-mime-save-parts-directory) + (read-directory-name (format-prompt + "Store in directory" + mh-mime-save-parts-directory) "" mh-mime-save-parts-directory t "")) ((stringp mh-mime-save-parts-default-directory) mh-mime-save-parts-default-directory) @@ -413,7 +409,7 @@ do the work." (cd directory) (setq mh-mime-save-parts-directory directory) (let ((initial-size (mh-truncate-log-buffer))) - (apply 'call-process + (apply #'call-process (expand-file-name command mh-progs) nil t nil (mh-list-to-string (list folder msg "-auto" (if (not (mh-variant-p 'nmh)) @@ -452,7 +448,7 @@ decoding the same message multiple times." (let ((b (point)) (clean-message-header mh-clean-message-header-flag) (invisible-headers mh-invisible-header-fields-compiled) - (visible-headers nil)) + ) ;; (visible-headers nil) (save-excursion (save-restriction (narrow-to-region b b) @@ -474,7 +470,7 @@ decoding the same message multiple times." (cond (clean-message-header (mh-clean-msg-header (point-min) invisible-headers - visible-headers) + nil) ;; visible-headers (goto-char (point-min))) (t (mh-start-of-uncleaned-message))) @@ -489,15 +485,11 @@ decoding the same message multiple times." (mh-display-emphasis) (mm-handle-set-undisplayer handle - `(lambda () - (let (buffer-read-only) - (if (fboundp 'remove-specifier) - ;; This is only valid on XEmacs. - (mapcar (lambda (prop) - (remove-specifier - (face-property 'default prop) (current-buffer))) - '(background background-pixmap foreground))) - (delete-region ,(point-min-marker) ,(point-max-marker))))))))) + (let ((beg (point-min-marker)) + (end (point-max-marker))) + (lambda () + (let ((inhibit-read-only t)) + (delete-region beg end))))))))) ;;;###mh-autoload (defun mh-decode-message-header () @@ -783,7 +775,7 @@ This is only useful if a Content-Disposition header is not present." (funcall media-test handle) ; Since mm-inline-large-images is T, ; this only tells us if the image is ; something that emacs can display - (let* ((image (mm-get-image handle))) + (let ((image (mm-get-image handle))) (or (mh-do-in-xemacs (and (mh-funcall-if-exists glyphp image) (< (glyph-width image) @@ -792,7 +784,7 @@ This is only useful if a Content-Disposition header is not present." (or mh-max-inline-image-height (window-pixel-height))))) (mh-do-in-gnu-emacs - (let ((size (mh-funcall-if-exists image-size image))) + (let ((size (and (fboundp 'image-size) (image-size image)))) (and size (< (cdr size) (or mh-max-inline-image-height (1- (window-height)))) @@ -1225,7 +1217,7 @@ The option `mh-compose-insertion' controls what type of tags are inserted." t) t t))) (list description folder range))) - (let ((messages (mapconcat 'identity (mh-list-to-string range) " "))) + (let ((messages (mapconcat #'identity (mh-list-to-string range) " "))) (dolist (message (mh-translate-range folder messages)) (if (equal mh-compose-insertion 'mml) (mh-mml-forward-message description folder (format "%s" message)) @@ -1258,11 +1250,7 @@ See also \\[mh-mh-to-mime]." (interactive (list (mml-minibuffer-read-description) (mh-prompt-for-folder "Message from" mh-sent-from-folder nil) - (read-string (concat "Messages" - (if (numberp mh-sent-from-msg) - (format " (default %d): " - mh-sent-from-msg) - ": "))))) + (read-string (format-prompt "Messages" mh-sent-from-msg)))) (beginning-of-line) (insert "#forw [") (and description @@ -1596,7 +1584,7 @@ the possible security methods (see `mh-mml-method-default')." (if current-prefix-arg (let ((def (or (car mh-mml-cryptographic-method-history) mh-mml-method-default))) - (completing-read (format "Method (default %s): " def) + (completing-read (format-prompt "Method" def) '(("pgp") ("pgpmime") ("smime")) nil t nil 'mh-mml-cryptographic-method-history def)) mh-mml-method-default)) @@ -1731,7 +1719,7 @@ Optional argument DEFAULT is returned if a type isn't entered." (type (or (and (not (equal probed-type "application/octet-stream")) probed-type) (completing-read - (format "Content type (default %s): " default) + (format-prompt "Content type" default) (mapcar #'list (mailcap-mime-types)))))) (if (not (equal type "")) type diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el index 513a1bc953d..2074ff6f8f3 100644 --- a/lisp/mh-e/mh-print.el +++ b/lisp/mh-e/mh-print.el @@ -1,4 +1,4 @@ -;;; mh-print.el --- MH-E printing support +;;; mh-print.el --- MH-E printing support -*- lexical-binding: t; -*- ;; Copyright (C) 2003-2021 Free Software Foundation, Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -207,8 +205,9 @@ Consider using \\[mh-ps-print-msg] instead." ;; Print scan listing if we have more than one message. (if (> (length msgs) 1) (let* ((msgs-string - (mapconcat 'identity (mh-list-to-string - (mh-coalesce-msg-list msgs)) " ")) + (mapconcat #'identity (mh-list-to-string + (mh-coalesce-msg-list msgs)) + " ")) (lpr-command (format mh-lpr-command-format (cond ((listp range) diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el index cec331389b0..10235209dce 100644 --- a/lisp/mh-e/mh-scan.el +++ b/lisp/mh-e/mh-scan.el @@ -1,4 +1,4 @@ -;;; mh-scan.el --- MH-E scan line constants and utilities +;;; mh-scan.el --- MH-E scan line constants and utilities -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -27,8 +27,6 @@ ;; This file contains constants and a few functions for interpreting ;; scan lines. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -115,8 +113,8 @@ expression which matches the body text as in the default of not correct, the body fragment will not be highlighted with the face `mh-folder-body'.") -(defvar mh-scan-blacklisted-msg-regexp "^\\( *[0-9]+\\)B" - "This regular expression matches blacklisted (spam) messages. +(defvar mh-scan-blocklisted-msg-regexp "^\\( *[0-9]+\\)B" + "This regular expression matches blocklisted (spam) messages. It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this @@ -127,9 +125,9 @@ matches the message number as in the default of This expression includes the leading space within parenthesis since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-blacklisted'. This regular +is done with the face `mh-folder-blocklisted'. This regular expression should be correct as it is needed by non-fontification -functions. See also `mh-note-blacklisted'.") +functions. See also `mh-note-blocklisted'.") (defvar mh-scan-cur-msg-number-regexp "^\\( *[0-9]+\\+\\).*" "This regular expression matches the current message. @@ -297,21 +295,21 @@ non-fontification functions.") This is used to eliminate error messages that are occasionally produced by \"inc\".") -(defvar mh-scan-whitelisted-msg-regexp "^\\( *[0-9]+\\)W" - "This regular expression matches whitelisted (non-spam) messages. +(defvar mh-scan-allowlisted-msg-regexp "^\\( *[0-9]+\\)A" + "This regular expression matches allowlisted (non-spam) messages. It must match from the beginning of the line. Note that the default setting of `mh-folder-font-lock-keywords' expects this expression to contain at least one parenthesized expression which matches the message number as in the default of - \"^\\\\( *[0-9]+\\\\)W\". + \"^\\\\( *[0-9]+\\\\)A\". This expression includes the leading space within parenthesis since it looks better to highlight it as well. The highlighting -is done with the face `mh-folder-whitelisted'. This regular +is done with the face `mh-folder-allowlisted'. This regular expression should be correct as it is needed by non-fontification -functions. See also `mh-note-whitelisted'.") +functions. See also `mh-note-allowlisted'.") @@ -335,8 +333,8 @@ This column will have one of the values: \" \", \"^\", \"D\", \"B\", \"W\", \"+\ \" \" is the default value, \"^\" is the `mh-note-refiled' character, \"D\" is the `mh-note-deleted' character, - \"B\" is the `mh-note-blacklisted' character, - \"W\" is the `mh-note-whitelisted' character, and + \"B\" is the `mh-note-blocklisted' character, + \"A\" is the `mh-note-allowlisted' character, and \"+\" is the `mh-note-cur' character.") (defvar mh-scan-destination-width 1 @@ -401,9 +399,9 @@ This column will only ever have spaces in it.") ;; Alphabetical. -(defvar mh-note-blacklisted ?B - "Messages that have been blacklisted are marked by this character. -See also `mh-scan-blacklisted-msg-regexp'.") +(defvar mh-note-blocklisted ?B + "Messages that have been blocklisted are marked by this character. +See also `mh-scan-blocklisted-msg-regexp'.") (defvar mh-note-cur ?+ "The current message (in MH, not in MH-E) is marked by this character. @@ -438,9 +436,9 @@ See also `mh-scan-refiled-msg-regexp'.") Messages in the \"search\" sequence are marked by this character as well.") -(defvar mh-note-whitelisted ?W - "Messages that have been whitelisted are marked by this character. -See also `mh-scan-whitelisted-msg-regexp'.") +(defvar mh-note-allowlisted ?A + "Messages that have been allowlisted are marked by this character. +See also `mh-scan-allowlisted-msg-regexp'.") @@ -497,7 +495,7 @@ with `mh-scan-msg-format-string'." (width 0)) (with-current-buffer tmp-buffer (erase-buffer) - (apply 'call-process + (apply #'call-process (expand-file-name mh-scan-prog mh-progs) nil '(t nil) nil (list folder "last" "-format" "%(msg)")) (goto-char (point-min)) diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index 05ba12d7617..e03c9dc83f7 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -1,4 +1,4 @@ -;;; mh-search --- MH-Search mode +;;; mh-search.el --- MH-Search mode -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. @@ -39,8 +39,6 @@ ;; documentation will direct you to the specific instructions for ;; your particular searcher. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -274,23 +272,23 @@ folder containing the index search results." t))) ;; Copy the search results over. - (maphash #'(lambda (folder msgs) - (let ((cur (car (mh-translate-range folder "cur"))) - (msgs (sort (cl-loop - for msg being the hash-keys of msgs - collect msg) - #'<))) - (mh-exec-cmd "refile" msgs "-src" folder - "-link" index-folder) - ;; Restore cur to old value, that refile changed - (when cur - (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" - "-sequence" - "cur" (format "%s" cur))) - (cl-loop for msg in msgs - do (cl-incf result-count) - (setf (gethash result-count origin-map) - (cons folder msg))))) + (maphash (lambda (folder msgs) + (let ((cur (car (mh-translate-range folder "cur"))) + (msgs (sort (cl-loop + for msg being the hash-keys of msgs + collect msg) + #'<))) + (mh-exec-cmd "refile" msgs "-src" folder + "-link" index-folder) + ;; Restore cur to old value, that refile changed + (when cur + (mh-exec-cmd-quiet nil "mark" folder "-add" "-zero" + "-sequence" + "cur" (format "%s" cur))) + (cl-loop for msg in msgs + do (cl-incf result-count) + (setf (gethash result-count origin-map) + (cons folder msg))))) folder-results-map) ;; Vist the results folder. @@ -332,7 +330,7 @@ configuration and is used when the search folder is dismissed." (interactive (list (mh-prompt-for-folder "Search" mh-current-folder nil nil t) (current-window-configuration))) ;; FIXME: `pick-folder' is unused! - (let ((pick-folder (if (equal folder "+") mh-current-folder folder))) + (let () ;; (pick-folder (if (equal folder "+") mh-current-folder folder)) (switch-to-buffer-other-window "search-pattern") (if (or (zerop (buffer-size)) (not (y-or-n-p "Reuse pattern? "))) @@ -356,7 +354,7 @@ configuration and is used when the search folder is dismissed." "---------\n") (mh-search-mode) (goto-char (point-min)) - (dotimes (i 5) + (dotimes (_ 5) (add-text-properties (point) (1+ (point)) '(front-sticky t)) (add-text-properties (- (mh-line-end-position) 2) (1- (mh-line-end-position)) @@ -453,7 +451,7 @@ search all folders." (defvar mh-flists-search-folders) -(defun mh-flists-execute (&rest ignored) +(defun mh-flists-execute (&rest _ignored) "Execute flists. Search for messages belonging to `mh-flists-sequence' in the folders specified by `mh-flists-search-folders'. If @@ -880,7 +878,7 @@ used to search." folder-path (format "%s/" folder-path))))) -(defalias 'mh-swish++-next-result 'mh-swish-next-result) +(defalias 'mh-swish++-next-result #'mh-swish-next-result) (defun mh-swish++-regexp-builder (regexp-list) "Generate query for swish++. @@ -1136,10 +1134,10 @@ REGEXP-LIST is an alist of fields and values." ((atom (cadr expr)) `(or (and ,expr))) ((eq (caadr expr) 'not) (mh-mairix-convert-to-sop* (cadadr expr))) ((eq (caadr expr) 'and) (mh-mairix-convert-to-sop* - `(or ,@(mapcar #'(lambda (x) `(not ,x)) + `(or ,@(mapcar (lambda (x) `(not ,x)) (cdadr expr))))) ((eq (caadr expr) 'or) (mh-mairix-convert-to-sop* - `(and ,@(mapcar #'(lambda (x) `(not ,x)) + `(and ,@(mapcar (lambda (x) `(not ,x)) (cdadr expr))))) (t (error "Unreachable: %s" expr)))) @@ -1450,7 +1448,7 @@ being the list of messages originally from that folder." (defun mh-index-execute-commands () "Perform the outstanding operations on the actual messages. The copies in the searched folder are then deleted, refiled, -blacklisted and whitelisted to get the desired result. Before +blocklisted and allowlisted to get the desired result. Before processing the messages we make sure that the message is identical to the one that the user has marked in the index buffer." @@ -1467,12 +1465,12 @@ buffer." (with-current-buffer folder (let ((old-refile-list mh-refile-list) (old-delete-list mh-delete-list) - (old-blacklist mh-blacklist) - (old-whitelist mh-whitelist)) + (old-blocklist mh-blocklist) + (old-allowlist mh-allowlist)) (setq mh-refile-list nil mh-delete-list msgs - mh-blacklist nil - mh-whitelist nil) + mh-blocklist nil + mh-allowlist nil) (unwind-protect (mh-execute-commands) (setq mh-refile-list (mapcar (lambda (x) @@ -1484,11 +1482,11 @@ buffer." mh-delete-list (cl-loop for x in old-delete-list unless (memq x msgs) collect x) - mh-blacklist - (cl-loop for x in old-blacklist + mh-blocklist + (cl-loop for x in old-blocklist unless (memq x msgs) collect x) - mh-whitelist - (cl-loop for x in old-whitelist + mh-allowlist + (cl-loop for x in old-allowlist unless (memq x msgs) collect x)) (mh-set-folder-modified-p (mh-outstanding-commands-p)) (when (mh-outstanding-commands-p) @@ -1496,8 +1494,8 @@ buffer." (mh-index-matching-source-msgs (append (cl-loop for x in mh-refile-list append (cdr x)) mh-delete-list - mh-blacklist - mh-whitelist) + mh-blocklist + mh-allowlist) t)) folders))) @@ -1620,7 +1618,7 @@ garbled." (cl-loop for seq in seq-list do (apply #'mh-exec-cmd "mark" mh-current-folder "-sequence" (symbol-name (car seq)) "-add" - (mapcar #'(lambda (x) (format "%s" x)) (cdr seq)))))) + (mapcar (lambda (x) (format "%s" x)) (cdr seq)))))) ;;;###mh-autoload (defun mh-create-sequence-map (seq-list) @@ -1853,7 +1851,7 @@ PROC is used to convert the value to actual data." (1+ last-slash) (1- last-space))) (buffer-substring-no-properties (1+ last-space) end)))))) -(defalias 'mh-md5-parser 'mh-openssl-parser) +(defalias 'mh-md5-parser #'mh-openssl-parser) ;;;###mh-autoload (defun mh-index-update-maps (folder &optional origin-map) @@ -1945,4 +1943,4 @@ folder buffer." ;; sentence-end-double-space: nil ;; End: -;;; mh-search ends here +;;; mh-search.el ends here diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el index e8a03f6704b..9cdf39f7f1e 100644 --- a/lisp/mh-e/mh-seq.el +++ b/lisp/mh-e/mh-seq.el @@ -1,4 +1,4 @@ -;;; mh-seq.el --- MH-E sequences support +;;; mh-seq.el --- MH-E sequences support -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 2001-2021 Free Software Foundation, Inc. @@ -26,8 +26,6 @@ ;; Sequences are stored in the alist `mh-seq-list' in the form: ;; ((seq-name msgs ...) (seq-name msgs ...) ...) -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -156,7 +154,7 @@ The list appears in a buffer named \"*MH-E Sequences*\"." (let ((name (mh-seq-name (car seq-list))) (sorted-seq-msgs (mh-coalesce-msg-list - (sort (copy-sequence (mh-seq-msgs (car seq-list))) '<))) + (sort (copy-sequence (mh-seq-msgs (car seq-list))) #'<))) name-spec) (insert (setq name-spec (format (format "%%%ss:" max-len) name))) (while sorted-seq-msgs @@ -191,7 +189,7 @@ MESSAGE appears." (cond (dest-folder (format " (to be refiled to %s)" dest-folder)) (deleted-flag (format " (to be deleted)")) (t "")) - (mapconcat 'concat + (mapconcat #'concat (mh-list-to-string (mh-seq-containing-msg message t)) " ")))) @@ -390,10 +388,7 @@ Prompt with PROMPT, raise an error if the sequence is empty and the NOT-EMPTY flag is non-nil, and supply an optional DEFAULT sequence. A reply of `%' defaults to the first sequence containing the current message." - (let* ((input (completing-read (format "%s sequence%s: " prompt - (if default - (format " (default %s)" default) - "")) + (let* ((input (completing-read (format-prompt "%s sequence" default prompt) (mh-seq-names mh-seq-list) nil nil nil 'mh-sequence-history)) (seq (cond ((equal input "%") @@ -494,13 +489,13 @@ folder buffer are not updated." ;; Add to a SEQUENCE each message the list of MSGS. (if (and (mh-valid-seq-p seq) (not (mh-folder-name-p seq))) (if msgs - (apply 'mh-exec-cmd "mark" mh-current-folder "-add" + (apply #'mh-exec-cmd "mark" mh-current-folder "-add" "-sequence" (symbol-name seq) (mh-coalesce-msg-list msgs))))) (defun mh-canonicalize-sequence (msgs) "Sort MSGS in decreasing order and remove duplicates." - (let* ((sorted-msgs (sort (copy-sequence msgs) '>)) + (let* ((sorted-msgs (sort (copy-sequence msgs) #'>)) (head sorted-msgs)) (while (cdr head) (if (= (car head) (cadr head)) @@ -565,7 +560,7 @@ OP is one of `widen' and `unthread'." (defvar mh-range-seq-names) (defvar mh-range-history ()) (defvar mh-range-completion-map (copy-keymap minibuffer-local-completion-map)) -(define-key mh-range-completion-map " " 'self-insert-command) +(define-key mh-range-completion-map " " #'self-insert-command) ;;;###mh-autoload (defun mh-interactive-range (range-prompt &optional default) @@ -646,13 +641,10 @@ should be replaced with: ((stringp default) default) ((symbolp default) (symbol-name default)))) (prompt (cond ((and guess large default) - (format "%s (folder has %s messages, default %s)" - prompt (car counts) default)) - ((and guess large) - (format "%s (folder has %s messages)" - prompt (car counts))) + (format-prompt "%s (folder has %s messages)" + default prompt (car counts))) (default - (format "%s (default %s)" prompt default)))) + (format-prompt prompt default)))) (minibuffer-local-completion-map mh-range-completion-map) (seq-list (if (eq folder mh-current-folder) mh-seq-list @@ -662,7 +654,7 @@ should be replaced with: (mh-seq-names seq-list))) (input (cond ((and (not ask-flag) unseen) (symbol-name mh-unseen-seq)) ((and (not ask-flag) (not large)) "all") - (t (completing-read (format "%s: " prompt) + (t (completing-read prompt 'mh-range-completion-function nil nil nil 'mh-range-history default)))) msg-list) diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el index 9ad843c3259..803f07e02b2 100644 --- a/lisp/mh-e/mh-show.el +++ b/lisp/mh-e/mh-show.el @@ -1,4 +1,4 @@ -;;; mh-show.el --- MH-Show mode +;;; mh-show.el --- MH-Show mode -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -26,8 +26,6 @@ ;; Mode for showing messages. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -136,7 +134,7 @@ displayed." (show-window (get-buffer-window mh-show-buffer)) (display-mime-buttons-flag mh-display-buttons-for-inline-parts-flag)) (if (not (eq (next-window (minibuffer-window)) (selected-window))) - (delete-other-windows)) ; force ourself to the top window + (delete-other-windows)) ; force ourselves to the top window (mh-in-show-buffer (mh-show-buffer) (setq mh-display-buttons-for-inline-parts-flag display-mime-buttons-flag) (if (and show-window @@ -187,7 +185,7 @@ Sets the current buffer to the show buffer." (set-buffer folder) ;; When Gnus uses external displayers it has to keep handles longer. So ;; we will delete these handles when mh-quit is called on the folder. It - ;; would be nicer if there are weak pointers in emacs lisp, then we could + ;; would be nicer if there are weak pointers in Emacs Lisp, then we could ;; get the garbage collector to do this for us. (unless (mh-buffer-data) (setf (mh-buffer-data) (mh-make-buffer-data))) @@ -195,7 +193,7 @@ Sets the current buffer to the show buffer." (let ((formfile mh-mhl-format-file) (clean-message-header mh-clean-message-header-flag) (invisible-headers mh-invisible-header-fields-compiled) - (visible-headers nil) + ;; (visible-headers nil) (msg-filename (mh-msg-filename msg-num folder-name)) (show-buffer mh-show-buffer) (mm-inline-media-tests mh-mm-inline-media-tests)) @@ -241,7 +239,7 @@ Sets the current buffer to the show buffer." (cond (clean-message-header (mh-clean-msg-header (point-min) invisible-headers - visible-headers) + nil) ;; visible-headers (goto-char (point-min))) (t (mh-start-of-uncleaned-message))) @@ -465,8 +463,10 @@ still visible.\n") (mh-defun-show-buffer mh-show-index-visit-folder mh-index-visit-folder t) (mh-defun-show-buffer mh-show-toggle-tick mh-toggle-tick) (mh-defun-show-buffer mh-show-narrow-to-tick mh-narrow-to-tick) -(mh-defun-show-buffer mh-show-junk-blacklist mh-junk-blacklist) -(mh-defun-show-buffer mh-show-junk-whitelist mh-junk-whitelist) +(mh-defun-show-buffer mh-show-junk-allowlist mh-junk-allowlist) +(mh-defun-show-buffer mh-show-junk-whitelist mh-junk-allowlist) +(make-obsolete 'mh-show-junk-whitelist 'mh-show-junk-allowlist "28.1") +(mh-defun-show-buffer mh-show-junk-blocklist mh-junk-blocklist) (mh-defun-show-buffer mh-show-index-new-messages mh-index-new-messages) (mh-defun-show-buffer mh-show-index-ticked-messages mh-index-ticked-messages) (mh-defun-show-buffer mh-show-index-sequenced-messages @@ -635,7 +635,8 @@ still visible.\n") (gnus-define-keys (mh-show-junk-map "J" mh-show-mode-map) "?" mh-prefix-help - "b" mh-show-junk-blacklist + "a" mh-show-junk-allowlist + "b" mh-show-junk-blocklist "w" mh-show-junk-whitelist) (gnus-define-keys (mh-show-ps-print-map "P" mh-show-mode-map) @@ -862,7 +863,7 @@ See also `mh-folder-mode'. (turn-on-font-lock)) (when mh-decode-mime-flag (mh-make-local-hook 'kill-buffer-hook) - (add-hook 'kill-buffer-hook 'mh-mime-cleanup nil t)) + (add-hook 'kill-buffer-hook #'mh-mime-cleanup nil t)) (mh-do-in-xemacs (easy-menu-add mh-show-sequence-menu) (easy-menu-add mh-show-message-menu) diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el index 7cbd42c8ea2..76ef990d825 100644 --- a/lisp/mh-e/mh-speed.el +++ b/lisp/mh-e/mh-speed.el @@ -1,4 +1,4 @@ -;;; mh-speed.el --- MH-E speedbar support +;;; mh-speed.el --- MH-E speedbar support -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2021 Free Software Foundation, Inc. @@ -26,8 +26,6 @@ ;; Future versions should only use flists. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -100,9 +98,9 @@ ;; Alphabetical. -(defalias 'mh-speed-contract-folder 'mh-speed-toggle) +(defalias 'mh-speed-contract-folder #'mh-speed-toggle) -(defalias 'mh-speed-expand-folder 'mh-speed-toggle) +(defalias 'mh-speed-expand-folder #'mh-speed-toggle) (defun mh-speed-refresh () "Regenerates the list of folders in the speedbar. @@ -202,9 +200,9 @@ created." (mh-speed-flists nil)))) ;;;###mh-autoload -(defalias 'mh-show-speedbar-buttons 'mh-folder-speedbar-buttons) +(defalias 'mh-show-speedbar-buttons #'mh-folder-speedbar-buttons) ;;;###mh-autoload -(defalias 'mh-letter-speedbar-buttons 'mh-folder-speedbar-buttons) +(defalias 'mh-letter-speedbar-buttons #'mh-folder-speedbar-buttons) (defmacro mh-speed-select-attached-frame () "Compatibility macro to handle speedbar versions 0.11a and 0.14beta4." @@ -431,7 +429,7 @@ flists is run only for that one folder." (setq mh-speed-flists-folder nil) (mh-process-kill-without-query mh-speed-flists-process) (set-process-filter mh-speed-flists-process - 'mh-speed-parse-flists-output))))))) + #'mh-speed-parse-flists-output))))))) ;; Copied from mh-make-folder-list-filter... ;; XXX Refactor to use mh-make-folder-list-filer? @@ -443,7 +441,7 @@ be handled next." (position 0) line-end line folder unseen total) (unwind-protect - (while (setq line-end (string-match "\n" output position)) + (while (setq line-end (string-search "\n" output position)) (setq line (format "%s%s" mh-speed-partial-line (substring output position line-end)) diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el index 365746259af..89b0dbd9798 100644 --- a/lisp/mh-e/mh-thread.el +++ b/lisp/mh-e/mh-thread.el @@ -1,4 +1,4 @@ -;;; mh-thread.el --- MH-E threading support +;;; mh-thread.el --- MH-E threading support -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2004, 2006-2021 Free Software Foundation, Inc. @@ -69,8 +69,6 @@ ;; (5) Better canonicalizing for message identifier and subject ;; strings. -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -233,7 +231,7 @@ sibling." (push index msg-list))) (forward-line)) (mh-scan-folder mh-current-folder - (mapcar #'(lambda (x) (format "%s" x)) + (mapcar (lambda (x) (format "%s" x)) (mh-coalesce-msg-list msg-list)) t)) (when mh-index-data @@ -591,7 +589,7 @@ Only information about messages in MSG-LIST are added to the tree." #'call-process (expand-file-name mh-scan-prog mh-progs) nil '(t nil) nil "-width" "10000" "-format" "%(msg)\n%{message-id}\n%{references}\n%{in-reply-to}\n%{subject}\n" - folder (mapcar #'(lambda (x) (format "%s" x)) msg-list))) + folder (mapcar (lambda (x) (format "%s" x)) msg-list))) (goto-char (point-min)) (let ((roots ()) (case-fold-search t)) @@ -635,9 +633,9 @@ Only information about messages in MSG-LIST are added to the tree." (mh-thread-remove-parent-link id) (mh-thread-add-link (car ancestors) id))) (mh-thread-add-link (car ancestors) (cadr ancestors))))))) - (maphash #'(lambda (_k v) - (when (null (mh-container-parent v)) - (push v roots))) + (maphash (lambda (_k v) + (when (null (mh-container-parent v)) + (push v roots))) mh-thread-id-table) (setq roots (mh-thread-prune-containers roots)) (prog1 (setq roots (mh-thread-group-by-subject roots)) @@ -720,25 +718,25 @@ For now it will take the last string inside angles." mh-thread-history) (mh-thread-remove-parent-link node))))) (let ((results ())) - (maphash #'(lambda (_k v) - (when (and (null (mh-container-parent v)) - (gethash (mh-message-id (mh-container-message v)) - mh-thread-id-index-map)) - (push v results))) + (maphash (lambda (_k v) + (when (and (null (mh-container-parent v)) + (gethash (mh-message-id (mh-container-message v)) + mh-thread-id-index-map)) + (push v results))) mh-thread-id-table) (mh-thread-sort-containers results)))) (defun mh-thread-sort-containers (containers) "Sort a list of message CONTAINERS to be in ascending order wrt index." (sort containers - #'(lambda (x y) - (when (and (mh-container-message x) (mh-container-message y)) - (let* ((id-x (mh-message-id (mh-container-message x))) - (id-y (mh-message-id (mh-container-message y))) - (index-x (gethash id-x mh-thread-id-index-map)) - (index-y (gethash id-y mh-thread-id-index-map))) - (and (integerp index-x) (integerp index-y) - (< index-x index-y))))))) + (lambda (x y) + (when (and (mh-container-message x) (mh-container-message y)) + (let* ((id-x (mh-message-id (mh-container-message x))) + (id-y (mh-message-id (mh-container-message y))) + (index-x (gethash id-x mh-thread-id-index-map)) + (index-y (gethash id-y mh-thread-id-index-map))) + (and (integerp index-x) (integerp index-y) + (< index-x index-y))))))) (defvar mh-thread-last-ancestor) diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el index 7dbddbc891b..94aa8dd4a92 100644 --- a/lisp/mh-e/mh-tool-bar.el +++ b/lisp/mh-e/mh-tool-bar.el @@ -1,4 +1,4 @@ -;;; mh-tool-bar.el --- MH-E tool bar support +;;; mh-tool-bar.el --- MH-E tool bar support -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -356,7 +354,7 @@ Use SEQUENCE-MAP if display is limited; DEFAULT-MAP otherwise." '(list ,@(mapcar (lambda (x) `(quote ,x)) folder-defaults)) "List of buttons to include in MH-Folder tool bar." :group 'mh-tool-bar - :set 'mh-tool-bar-folder-buttons-set + :set #'mh-tool-bar-folder-buttons-set :type '(set ,@(cl-loop for x in folder-buttons for y in folder-docs collect `(const :tag ,y ,x))) @@ -367,7 +365,7 @@ Use SEQUENCE-MAP if display is limited; DEFAULT-MAP otherwise." '(list ,@(mapcar (lambda (x) `(quote ,x)) letter-defaults)) "List of buttons to include in MH-Letter tool bar." :group 'mh-tool-bar - :set 'mh-tool-bar-letter-buttons-set + :set #'mh-tool-bar-letter-buttons-set :type '(set ,@(cl-loop for x in letter-buttons for y in letter-docs collect `(const :tag ,y ,x))) diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el index d7c607df5c3..bbce17013b1 100644 --- a/lisp/mh-e/mh-utils.el +++ b/lisp/mh-e/mh-utils.el @@ -1,4 +1,4 @@ -;;; mh-utils.el --- MH-E general utilities +;;; mh-utils.el --- MH-E general utilities -*- lexical-binding: t; -*- ;; Copyright (C) 1993, 1995, 1997, 2000-2021 Free Software Foundation, ;; Inc. @@ -24,8 +24,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -268,7 +266,7 @@ and displayed in a help buffer." (interactive) (let* ((help (or help-messages (cdr (assoc nil (assoc major-mode mh-help-messages))))) - (text (substitute-command-keys (mapconcat 'identity help "")))) + (text (substitute-command-keys (mapconcat #'identity help "")))) (with-electric-help (lambda () (insert text)) @@ -298,7 +296,7 @@ and displayed in a help buffer." This is the inverse of `mh-read-msg-list', which expands ranges. Message lists passed to MH programs should be processed by this function to avoid exceeding system command line argument limits." - (let ((msgs (sort (copy-sequence messages) 'mh-greaterp)) + (let ((msgs (sort (copy-sequence messages) #'mh-greaterp)) (range-high nil) (prev -1) (ranges nil)) @@ -380,7 +378,7 @@ names and the function is called when OUTPUT is available." (prevailing-match-data (match-data)) line-end folder) (unwind-protect - (while (setq line-end (string-match "\n" output position)) + (while (setq line-end (string-search "\n" output position)) (setq folder (format "+%s%s" mh-flists-partial-line (substring output position line-end))) @@ -544,8 +542,8 @@ nested folders within them." (mh-sub-folders-actual folder))) (t match)))) (if add-trailing-slash-flag - (mapcar #'(lambda (x) - (if (cdr x) (cons (concat (car x) "/") (cdr x)) x)) + (mapcar (lambda (x) + (if (cdr x) (cons (concat (car x) "/") (cdr x)) x)) sub-folders) sub-folders))) @@ -669,7 +667,7 @@ three arguments so we bind this variable to t or nil. This variable should never be set.") (defvar mh-folder-completion-map (copy-keymap minibuffer-local-completion-map)) -(define-key mh-folder-completion-map " " 'minibuffer-complete) ;Why??? +(define-key mh-folder-completion-map " " #'minibuffer-complete) ;Why??? (defvar mh-speed-flists-inhibit-flag nil) @@ -704,7 +702,7 @@ See Info node `(elisp) Programmed Completion' for details." (let ((slash (mh-search-from-end ?/ orig-name))) (if slash (1+ slash) (if (string-match "\\`\\+" orig-name) 1 0))) - (if (cdr flag) (string-match "/" (cdr flag))))) + (if (cdr flag) (string-search "/" (cdr flag))))) ((eq flag nil) (let ((try-res (try-completion @@ -730,8 +728,7 @@ See Info node `(elisp) Programmed Completion' for details." (t (file-directory-p path)))))))) ;; Shush compiler. -(mh-do-in-xemacs - (defvar completion-root-regexp)) +(defvar completion-root-regexp) ;; Apparently used in XEmacs (defun mh-folder-completing-read (prompt default allow-root-folder-flag) "Read folder name with PROMPT and default result DEFAULT. @@ -758,10 +755,9 @@ function will accept the folder +, which means all folders when used in searching." (if (null default) (setq default "")) - (let* ((default-string (cond (default-string (format " (default %s)" default-string)) - ((equal "" default) "") - (t (format " (default %s)" default)))) - (prompt (format "%s folder%s: " prompt default-string)) + (let* ((default-string (or default-string + (if (equal default "") nil default))) + (prompt (format-prompt "%s folder" default-string prompt)) (mh-current-folder-name mh-current-folder) read-name folder-name) (while (and (setq read-name (mh-folder-completing-read @@ -925,10 +921,10 @@ Handle RFC 822 (or later) continuation lines." (defvar mh-hidden-header-keymap (let ((map (make-sparse-keymap))) (mh-do-in-gnu-emacs - (define-key map [mouse-2] 'mh-letter-toggle-header-field-display-button)) + (define-key map [mouse-2] #'mh-letter-toggle-header-field-display-button)) (mh-do-in-xemacs (define-key map '(button2) - 'mh-letter-toggle-header-field-display-button)) + #'mh-letter-toggle-header-field-display-button)) map)) ;;;###mh-autoload diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el index 036575a8e64..d4d5c5c3784 100644 --- a/lisp/mh-e/mh-xface.el +++ b/lisp/mh-e/mh-xface.el @@ -1,4 +1,4 @@ -;;; mh-xface.el --- MH-E X-Face and Face header field display +;;; mh-xface.el --- MH-E X-Face and Face header field display -*- lexical-binding: t; -*- ;; Copyright (C) 2002-2003, 2005-2021 Free Software Foundation, Inc. @@ -23,8 +23,6 @@ ;;; Commentary: -;;; Change Log: - ;;; Code: (require 'mh-e) @@ -365,7 +363,7 @@ Replace the ?/ character with a ?! character and append .png. Also replaces special characters with `mh-url-hexify-string' since not all characters, such as :, are valid within Windows filenames. In addition, replaces * with %2a. See URL -`http://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'." +`https://msdn.microsoft.com/library/default.asp?url=/library/en-us/shellcc/platform/shell/reference/ifaces/iitemnamelimits/GetValidCharacters.asp'." (format "%s/%s.png" mh-x-image-cache-directory (mh-replace-regexp-in-string "\\*" "%2a" |