emacs: reply: remove wrong sig/enc status buttons

This stops the (usually incorrect) sigstatus and encstatus buttons
appearing when replying in emacs, and updates the test suite to match.

Overriding the status button functions is a little unusual but much
less intrusive than passing an argument all the way down the call
chain. It also makes it clear exactly what it does.

We also hide the application/pgp-encrypted part as it can only contain
"Version: 1". We do this in notmuch show, which means it also happens
when replying.
This commit is contained in:
Mark Walters 2016-09-12 22:45:58 -03:00 committed by David Bremner
parent 653c5ee221
commit a448879e49
4 changed files with 8 additions and 5 deletions

View file

@ -253,8 +253,11 @@ mutiple parts get a header."
(notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function) (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
;; Don't indent multipart sub-parts. ;; Don't indent multipart sub-parts.
(notmuch-show-indent-multipart nil)) (notmuch-show-indent-multipart nil))
(notmuch-show-insert-body original (plist-get original :body) 0) ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
(buffer-substring-no-properties (point-min) (point-max))))) (letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
(notmuch-show-insert-body original (plist-get original :body) 0)
(buffer-substring-no-properties (point-min) (point-max))))))
(set-mark (point)) (set-mark (point))
(goto-char start) (goto-char start)

View file

@ -682,6 +682,9 @@ will return nil if the CID is unknown or cannot be retrieved."
(indent-rigidly start (point) 1))) (indent-rigidly start (point) 1)))
t) t)
(defun notmuch-show-insert-part-application/pgp-encrypted (msg part content-type nth depth button)
t)
(defun notmuch-show-insert-part-multipart/* (msg part content-type nth depth button) (defun notmuch-show-insert-part-multipart/* (msg part content-type nth depth button)
(let ((inner-parts (plist-get part :content)) (let ((inner-parts (plist-get part :content))
(start (point))) (start (point)))

View file

@ -384,8 +384,6 @@ References: <20091118002059.067214ed@hikari>
--text follows this line-- --text follows this line--
Adrian Perez de Castro <aperez@igalia.com> writes: Adrian Perez de Castro <aperez@igalia.com> writes:
> [ Unknown signature status ]
>
> Hello to all, > Hello to all,
> >
> I have just heard about Not Much today in some random Linux-related news > I have just heard about Not Much today in some random Linux-related news

View file

@ -317,7 +317,6 @@ test_expect_equal \
"$expected" "$expected"
test_begin_subtest "Reply within emacs to an encrypted message" test_begin_subtest "Reply within emacs to an encrypted message"
test_subtest_known_broken
test_emacs "(let ((message-hidden-headers '()) test_emacs "(let ((message-hidden-headers '())
(notmuch-crypto-process-mime 't)) (notmuch-crypto-process-mime 't))
(notmuch-show \"subject:test.encrypted.message.002\") (notmuch-show \"subject:test.encrypted.message.002\")