diff options
| author | Stephen Gildea <stepheng+emacs@gildea.com> | 2021-07-29 17:37:39 -0700 |
|---|---|---|
| committer | Stephen Gildea <stepheng+emacs@gildea.com> | 2021-07-29 17:38:39 -0700 |
| commit | 5fb8b20fa35a931660d9d59afc9ca863dd33a123 (patch) | |
| tree | 8e180f783ebee9f9b3265589a322c37ffb671f56 /lisp/mh-e/mh-search.el | |
| parent | 7e8d1b08e3e23bc783cad10e620c2ebe6536965c (diff) | |
| download | emacs-5fb8b20fa35a931660d9d59afc9ca863dd33a123.tar.gz emacs-5fb8b20fa35a931660d9d59afc9ca863dd33a123.tar.bz2 emacs-5fb8b20fa35a931660d9d59afc9ca863dd33a123.zip | |
mh-junk: replace color-based terms with descriptive words
* lisp/mh-e/*.el: "whitelist" -> "allowlist" and "blacklist" -> "blocklist".
* doc/misc/mh-e.texi: update manual to match.
* lisp/mh-e/folder.el: Change the binding of 'mh-junk-allowlist' to 'J a'.
Add a compatibility binding for the old 'J w'.
* lisp/mh-e/mh-scan.el (mh-note-allowlisted): Change char from 'W' to 'A'.
* lisp/mh-e/junk.el: Rename 'mh-blacklist-a-msg' to 'mh-junk-blocklist-a-msg',
adding the missing "junk-" to the function name.
Diffstat (limited to 'lisp/mh-e/mh-search.el')
| -rw-r--r-- | lisp/mh-e/mh-search.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index b3a250bf13a..e03c9dc83f7 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -1448,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." @@ -1465,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) @@ -1482,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) @@ -1494,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))) |