Merge branch 'release'

[notmuch] / emacs / notmuch-tag.el

diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index 49662c2034ce3c4d13f8bb980695b14ae5541616..09d182dfb818d6844efdab4ca3d626e9f2dd7d89 100644 (file)
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -57,10 +57,13 @@ tagging operations to apply, or a variable which contains a list
 of tagging operations such as `notmuch-archive-tags'. The final
 element is a name for this tagging operation. If the name is
 omitted or empty then the list of tag changes, or the variable
-name is used as the name. The key `r` should not be used as that
-is already bound: it switches the menu to a menu of the reverse
-tagging operations. The reverse of a tagging operation is the
-same list of individual tag-ops but with `+tag` replaced by
+name is used as the name.
+
+The key `notmuch-tag-jump-reverse-key' (k by default) should not
+be used (either as a key, or as the start of a key sequence) as
+it is already bound: it switches the menu to a menu of the
+reverse tagging operations. The reverse of a tagging operation is
+the same list of individual tag-ops but with `+tag` replaced by
 `-tag` and vice versa.
 
 If setting this variable outside of customize then it should be a
@@ -112,7 +115,12 @@ Used in the default value of `notmuch-tag-formats`."
   :group 'notmuch-faces)
 
 (defface notmuch-tag-flagged
-  '((t :foreground "blue"))
+  '((((class color)
+      (background dark))
+     (:foreground "LightBlue1"))
+    (((class color)
+      (background light))
+     (:foreground "blue")))
   "Face used for the flagged tag.
 
 Used in the default value of `notmuch-tag-formats`."
@@ -485,6 +493,9 @@ begin with a \"+\" or a \"-\". If REVERSE is non-nil, replace all
                s)))
          tags))
 
+(defvar notmuch-tag-jump-reverse-key "k"
+  "The key in tag-jump to switch to the reverse tag changes.")
+
 (defun notmuch-tag-jump (reverse)
   "Create a jump menu for tagging operations.
 
@@ -523,9 +534,10 @@ and vice versa."
        (push (list key name-string
                     `(lambda () (,tag-function ',tag-change)))
              action-map)))
-    (push (list "r" (if reverse
-                       "Forward tag changes "
-                     "Reverse tag changes")
+    (push (list notmuch-tag-jump-reverse-key
+               (if reverse
+                   "Forward tag changes "
+                 "Reverse tag changes")
                (apply-partially 'notmuch-tag-jump (not reverse)))
          action-map)
     (setq action-map (nreverse action-map))