emacs: redirect undo to notmuch-tag-undo

The double remap is a bit ugly, but it seems better than adding
another layer of keymaps for those modes where notmuch-tag-undo makes
sense.

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index beb25382aa2fa9f5c91bc653e80b79bf6281c0f6..4662e704f5c253ca99d1eb47456571d41faf3392 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -710,6 +710,9 @@ with `notmuch-hello-query-counts'."
   ;; that when we modify map it does not modify widget-keymap).
   (let ((map (make-composed-keymap (list (make-sparse-keymap) widget-keymap))))
     (set-keymap-parent map notmuch-common-keymap)
+    ;; Currently notmuch-hello-mode supports free text entry, but not
+    ;; tagging operations, so provide standard undo.
+    (define-key map [remap notmuch-tag-undo] #'undo)
     map)
   "Keymap for \"notmuch hello\" buffers.")
 

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 45817e1311dc7d4f4940e8573a924e05f7d9f10e..6fc71cc737995a5f4a66d205a0be58e458281ab3 100644 (file)
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -166,6 +166,7 @@ For example, if you wanted to remove an \"inbox\" tag and add an
     (define-key map (kbd "M-=") 'notmuch-refresh-all-buffers)
     (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)
     (define-key map "j" 'notmuch-jump-search)
+    (define-key map [remap undo] 'notmuch-tag-undo)
     map)
   "Keymap shared by all notmuch modes.")
 

diff --git a/test/T315-emacs-tagging.sh b/test/T315-emacs-tagging.sh
index fbaf5f22d4925d3e57d1c09daf709a402e4f7b2f..c26413ce903e47efccae1808aa6b69f57d908416 100755 (executable)
--- a/test/T315-emacs-tagging.sh
+++ b/test/T315-emacs-tagging.sh
@@ -151,7 +151,16 @@ for mode in search show tree unthreaded; do
     output=$(notmuch search $os_x_darwin_thread | notmuch_search_sanitize)
     notmuch tag "-one-$mode" "-three-$mode" $os_x_darwin_thread
     test_expect_equal "$output" "thread:XXX   2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox three-$mode unread)"
-done
 
+    test_begin_subtest "undo tagging in $mode mode (via binding)"
+    test_emacs "(let ((notmuch-tag-history nil))
+      (notmuch-$mode \"$os_x_darwin_thread\")
+      (notmuch-test-wait)
+      (execute-kbd-macro \"+tag-to-be-undone-$mode\")
+      (execute-kbd-macro (kbd \"C-x u\"))
+      (notmuch-test-wait))"
+    count=$(notmuch count "tag:tag-to-be-undone-$mode")
+    test_expect_equal "$count" "0"
+done
 
 test_done