diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2019-07-31 19:45:06 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2019-08-06 13:38:47 +0200 |
| commit | c676444a43e4634c1f98ec286b5bd9e46b23216b (patch) | |
| tree | 8381c0ef5720a92b845808e8e885f6b5976ee0a1 /lisp/gnus/spam.el | |
| parent | 1d8b5bc8dd543ada2f3c46436e43ea27faa3cd0e (diff) | |
| download | emacs-c676444a43e4634c1f98ec286b5bd9e46b23216b.tar.gz | |
Add conditional operator xor to subr.el
Suggested by Oleh Krehel and implemented by Basil Contovounesios in
the following thread:
https://lists.gnu.org/archive/html/emacs-devel/2019-07/msg00547.html
* lisp/array.el (xor): Move unused function from here...
* lisp/subr.el: ...to here, and improve.
* lisp/gnus/spam.el (spam-xor):
* lisp/play/5x5.el (5x5-xor):
* lisp/proced.el (proced-xor):
* lisp/progmodes/idlwave.el (idlwave-xor):
* lisp/vc/diff-mode.el (diff-xor): Define as obsolete aliases of,
and replace all uses with, xor.
* lisp/jsonrpc.el: Remove unused dependency on array.el.
* lisp/org/org.el (org-xor): Move from here...
* lisp/org/org-compat.el (org-xor): ...to here, as a compatibility
shim for xor.
* lisp/progmodes/idlw-shell.el (idlwave-shell-enable-all-bp):
* lisp/simple.el (exchange-point-and-mark):
* lisp/windmove.el (windmove-display-in-direction): Use xor.
* lisp/strokes.el (strokes-xor): Remove commented-out xor
implementation.
* doc/lispref/control.texi (Control Structures): Extend menu entry
for new combining condition.
(Combining Conditions):
* etc/NEWS (Lisp Changes): Document xor.
* test/lisp/subr-tests.el (subr-test-xor): New test.
Diffstat (limited to 'lisp/gnus/spam.el')
| -rw-r--r-- | lisp/gnus/spam.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index d752bf0efee..f990e0cba16 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -708,9 +708,7 @@ finds ham or spam.") "Clear the `spam-caches' entry for a check." (remhash symbol spam-caches)) -(defun spam-xor (a b) - "Logical A xor B." - (and (or a b) (not (and a b)))) +(define-obsolete-function-alias 'spam-xor 'xor "27.1") (defun spam-set-difference (list1 list2) "Return a set difference of LIST1 and LIST2. @@ -2550,7 +2548,7 @@ With a non-nil REMOVE, remove the ADDRESSES." (goto-char (point-min)) (dolist (article articles) (insert (spam-get-article-as-string article))) - (let* ((arg (if (spam-xor unregister article-is-spam-p) + (let* ((arg (if (xor unregister article-is-spam-p) "-spam" "-good")) (status |