From 19d873b5eff42ed66f5f3c7b9b807b4dd29df757 Mon Sep 17 00:00:00 2001
From: Omar Antolin Camarena <omar.antolin@gmail.com>
Date: Tue, 5 Mar 2024 08:59:56 -0600
Subject: Change default syntax for annotation matching to &

The @ sign is used for several other thing like user names on many
services which have Emacs clients, and is also used to add words to
local dictionaries in Jinx.
---
 README.org     | 5 +++--
 orderless.el   | 2 +-
 orderless.texi | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index dc9bbd1..49a08cc 100644
--- a/README.org
+++ b/README.org
@@ -191,8 +191,9 @@ Style modifiers should not be used directly in
 
  - ! modifies the component with =orderless-not=. Both =!bad= and
    =bad!= will match strings that do /not/ contain the pattern =bad=.
- - @ modifies the component with =orderless-annotation=. The pattern
-   will match against the candidate's annotation.
+ - & modifies the component with =orderless-annotation=. The pattern
+   will match against the candidate's annotation (cheesy mnemonic:
+   andnotation!).
  - , uses =orderless-initialism=.
  - = uses =orderless-literal=.
  - ^ uses =orderless-literal-prefix=.
diff --git a/orderless.el b/orderless.el
index 38a2624..4026fb4 100644
--- a/orderless.el
+++ b/orderless.el
@@ -130,7 +130,7 @@ customizing this variable to see a list of them."
 (defcustom orderless-affix-dispatch-alist
   `((?% . ,#'char-fold-to-regexp)
     (?! . ,#'orderless-not)
-    (?@ . ,#'orderless-annotation)
+    (?& . ,#'orderless-annotation)
     (?, . ,#'orderless-initialism)
     (?= . ,#'orderless-literal)
     (?^ . ,#'orderless-literal-prefix)
diff --git a/orderless.texi b/orderless.texi
index b381aa2..c62037d 100644
--- a/orderless.texi
+++ b/orderless.texi
@@ -247,8 +247,9 @@ special characters used as either a prefix or suffix:
 ! modifies the component with @samp{orderless-not}. Both @samp{!bad} and
 @samp{bad!} will match strings that do @emph{not} contain the pattern @samp{bad}.
 @item
-@@ modifies the component with @samp{orderless-annotation}. The pattern
-will match against the candidate's annotation.
+& modifies the component with @samp{orderless-annotation}. The pattern
+will match against the candidate's annotation (cheesy mnemonic:
+andnotation!).
 @item
 , uses @samp{orderless-initialism}.
 @item
-- 
cgit v1.0