--- devel/emacs-keybindings.org | 1 + emacs/notmuch-query.el | 4 +++- emacs/notmuch-show.el | 20 ++++++++++++++++++++ test/T450-emacs-show.sh | 12 ++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/devel/emacs-keybindings.org b/devel/emacs-keybindings.org index 00977bc3..ad7f72ef 100644 --- a/devel/emacs-keybindings.org +++ b/devel/emacs-keybindings.org @@ -40,6 +40,7 @@ | Z | notmuch-tree-from-search-current-query | notmuch-tree-from-show-current-query | | | =!= | | notmuch-show-toggle-elide-non-matching | | | =#= | | notmuch-show-print-message | | +| =%= | | notmuch-show-replace-msg | | | =$= | | notmuch-show-toggle-process-crypto | | | =*= | notmuch-search-tag-all | notmuch-show-tag-all | notmuch-tree-tag-thread | | + | notmuch-search-add-tag | notmuch-show-add-tag | notmuch-tree-add-tag | diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el index 5c7f4f8d..865e3ccf 100644 --- a/emacs/notmuch-query.el +++ b/emacs/notmuch-query.el @@ -25,7 +25,7 @@ ;;; Basic query function -(defun notmuch-query-get-threads (search-terms) +(defun notmuch-query-get-threads (search-terms &optional duplicate) "Return a list of threads of messages matching SEARCH-TERMS. A thread is a forest or list of trees. A tree is a two element @@ -34,6 +34,8 @@ is a possibly empty forest of replies." (let ((args '("show" "--format=sexp" "--format-version=5"))) (when notmuch-show-process-crypto (setq args (append args '("--decrypt=true")))) + (when duplicate + (setq args (append args (list (format "--duplicate=%d" duplicate))))) (setq args (append args search-terms)) (apply #'notmuch-call-notmuch-sexp args))) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index aded1ee7..1777756b 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1082,6 +1082,25 @@ is t, hide the part initially and show the button." (defvar notmuch-show-previous-subject "") (make-variable-buffer-local 'notmuch-show-previous-subject) +(defun notmuch-show-replace-msg (duplicate) + (interactive "Nduplicate: ") + (save-excursion + (let* ((extent (notmuch-show-message-extent)) + (id (notmuch-show-get-message-id)) + (depth (notmuch-show-get-depth)) + (inhibit-read-only t) + (new-msg (notmuch-query-get-threads (list id) duplicate))) + ;; clean up existing overlays to avoid extending them. + (dolist (o (overlays-in (car extent) (cdr extent))) + (delete-overlay o)) + ;; pretend insertion is happening at end of buffer + (narrow-to-region (point-min) (car extent)) + ;; Insert first, then delete, to avoid marker for start of next + ;; message being in same place as the start of this one. + (notmuch-show-insert-msg new-msg depth) + (widen) + (delete-region (point) (cdr extent))))) + (defun notmuch-show-insert-msg (msg depth) "Insert the message MSG at depth DEPTH in the current thread." (let* ((headers (plist-get msg :headers)) @@ -1537,6 +1556,7 @@ reset based on the original query." (define-key map "#" 'notmuch-show-print-message) (define-key map "!" 'notmuch-show-toggle-elide-non-matching) (define-key map "$" 'notmuch-show-toggle-process-crypto) + (define-key map "%" 'notmuch-show-replace-msg) (define-key map "<" 'notmuch-show-toggle-thread-indentation) (define-key map "t" 'toggle-truncate-lines) (define-key map "." 'notmuch-show-part-map) diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh index 0c1f6204..7fe58dfa 100755 --- a/test/T450-emacs-show.sh +++ b/test/T450-emacs-show.sh @@ -282,4 +282,16 @@ when we detect the word "attachment" and there's no attach? :p EOF test_expect_equal_file EXPECTED OUTPUT +add_email_corpus duplicate + +ID3=87r2ecrr6x.fsf@zephyr.silentflame.com +test_begin_subtest "duplicate=3" +test_emacs "(notmuch-show \"id:${ID3}\") + (notmuch-show-replace-msg 3) + (test-visible-output \"OUTPUT\")" +output=$(grep "Subject:" OUTPUT) +file=$(notmuch search --output=files id:${ID3} | head -n 3 | tail -n 1) +subject=$(grep '^Subject:' $file) +test_expect_equal "$output" "$subject" + test_done -- 2.35.2 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org