diff options
| author | David Bremner <david@tethera.net> | 2022-02-12 16:27:40 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-02-26 08:00:11 -0400 |
| commit | 19cf3910a553e5325d8da3a73669c6c452dbd99c (patch) | |
| tree | 96f8ef7a4afbe7e46f15303914d8dd396a2d4dd9 | |
| parent | cc2c3a383d12ce421c5ec1bdfb7bfacc60a0f368 (diff) | |
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.
| -rw-r--r-- | emacs/notmuch-hello.el | 3 | ||||
| -rw-r--r-- | emacs/notmuch-lib.el | 1 | ||||
| -rwxr-xr-x | test/T315-emacs-tagging.sh | 11 |
3 files changed, 14 insertions, 1 deletions
diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index beb25382..4662e704 100644 --- 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 45817e13..6fc71cc7 100644 --- 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 fbaf5f22..c26413ce 100755 --- 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 |