From: David Edmondson <dme@dme.org>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/3 v2] emacs: Don't return the button from `notmuch-show-insert-part-header'.
Date: Mon, 23 Jan 2012 10:33:02 +0000 [thread overview]
Message-ID: <1327314784-22555-1-git-send-email-dme@dme.org> (raw)
In-Reply-To: <cun39b66avm.fsf@hotblack-desiato.hh.sledj.net>
Instead, allow the caller to specify some parameters for the
button. Rework `notmuch-show-insert-part-multipart/signed' and
`notmuch-show-insert-part-multipart/encrypted' accordingly.
---
Removed the merge of multipart/signed and multipart/encrypted.
emacs/notmuch-show.el | 84 +++++++++++++++++++++++++-----------------------
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 03c1f6b..9144484 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -285,24 +285,23 @@ message at DEPTH in the current thread."
'follow-link t
'face 'message-mml)
-(defun notmuch-show-insert-part-header (nth content-type declared-type &optional name comment)
- (let ((button))
- (setq button
- (insert-button
- (concat "[ "
- (if name (concat name ": ") "")
- declared-type
- (if (not (string-equal declared-type content-type))
- (concat " (as " content-type ")")
- "")
- (or comment "")
- " ]")
- :type 'notmuch-show-part-button-type
- :notmuch-part nth
- :notmuch-filename name))
- (insert "\n")
- ;; return button
- button))
+(defun notmuch-show-insert-part-header (nth content-type declared-type
+ &optional name comment
+ &rest button-parameters)
+ (apply #'insert-button
+ (concat "[ "
+ (if name (concat name ": ") "")
+ declared-type
+ (if (not (string-equal declared-type content-type))
+ (concat " (as " content-type ")")
+ "")
+ (or comment "")
+ " ]")
+ :type 'notmuch-show-part-button-type
+ :notmuch-part nth
+ :notmuch-filename name
+ button-parameters)
+ (insert "\n"))
;; Functions handling particular MIME parts.
@@ -460,15 +459,18 @@ current buffer, if possible."
t)
(defun notmuch-show-insert-part-multipart/signed (msg part content-type nth depth declared-type)
- (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil)))
- (button-put button 'face 'notmuch-crypto-part-header)
- ;; add signature status button if sigstatus provided
- (if (plist-member part :sigstatus)
- (let* ((from (notmuch-show-get-header :From msg))
- (sigstatus (car (plist-get part :sigstatus))))
- (notmuch-crypto-insert-sigstatus-button sigstatus from))
- ;; if we're not adding sigstatus, tell the user how they can get it
- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")))
+ ;; Add signature status button if sigstatus provided.
+ (if (plist-member part :sigstatus)
+ (let ((from (notmuch-show-get-header :From msg))
+ (sigstatus (car (plist-get part :sigstatus))))
+ (notmuch-show-insert-part-header nth declared-type content-type nil nil
+ 'face 'notmuch-crypto-part-header)
+ (notmuch-crypto-insert-sigstatus-button sigstatus from))
+
+ ;; If we're not adding sigstatus, tell the user how to enable it.
+ (notmuch-show-insert-part-header nth declared-type content-type nil nil
+ 'face 'notmuch-crypto-part-header
+ 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))
(let ((inner-parts (plist-get part :content))
(start (point)))
@@ -482,19 +484,21 @@ current buffer, if possible."
t)
(defun notmuch-show-insert-part-multipart/encrypted (msg part content-type nth depth declared-type)
- (let ((button (notmuch-show-insert-part-header nth declared-type content-type nil)))
- (button-put button 'face 'notmuch-crypto-part-header)
- ;; add encryption status button if encstatus specified
- (if (plist-member part :encstatus)
- (let ((encstatus (car (plist-get part :encstatus))))
- (notmuch-crypto-insert-encstatus-button encstatus)
- ;; add signature status button if sigstatus specified
- (if (plist-member part :sigstatus)
- (let* ((from (notmuch-show-get-header :From msg))
- (sigstatus (car (plist-get part :sigstatus))))
- (notmuch-crypto-insert-sigstatus-button sigstatus from))))
- ;; if we're not adding encstatus, tell the user how they can get it
- (button-put button 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts.")))
+ ;; Add encryption status button if encstatus provided.
+ (if (plist-member part :encstatus)
+ (let ((encstatus (car (plist-get part :encstatus))))
+ (notmuch-show-insert-part-header nth declared-type content-type nil nil
+ 'face 'notmuch-crypto-part-header)
+ (notmuch-crypto-insert-encstatus-button encstatus)
+ ;; add signature status button if sigstatus specified
+ (if (plist-member part :sigstatus)
+ (let* ((from (notmuch-show-get-header :From msg))
+ (sigstatus (car (plist-get part :sigstatus))))
+ (notmuch-crypto-insert-sigstatus-button sigstatus from))))
+ ;; If we're not adding encstatus, tell the user how to enable it.
+ (notmuch-show-insert-part-header nth declared-type content-type nil nil
+ 'face 'notmuch-crypto-part-header
+ 'help-echo "Set notmuch-crypto-process-mime to process cryptographic mime parts."))
(let ((inner-parts (plist-get part :content))
(start (point)))
--
1.7.8.3
next prev parent reply other threads:[~2012-01-23 10:33 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 9:43 [PATCH 1/3] emacs: Tidy `notmuch-show-insert-part-header' David Edmondson
2012-01-20 9:43 ` [PATCH 2/3] emacs: Don't return the button from `notmuch-show-insert-part-header' David Edmondson
2012-01-20 20:20 ` Jameson Graef Rollins
2012-01-22 21:38 ` Jameson Graef Rollins
2012-01-23 8:16 ` David Edmondson
2012-01-23 8:52 ` Jameson Graef Rollins
2012-01-23 9:12 ` David Edmondson
2012-01-23 10:33 ` David Edmondson [this message]
2012-01-23 10:33 ` [PATCH 2/3 v2] emacs: Optionally hide some part headers David Edmondson
2012-01-23 10:33 ` [PATCH 3/3 v2] emacs: Don't insert a part header if it's the first part and text/* David Edmondson
2012-01-23 11:32 ` [PATCH 1/3 v2] emacs: Don't return the button from `notmuch-show-insert-part-header' David Edmondson
2012-01-20 9:43 ` [PATCH 3/3] emacs: Optionally hide some part headers David Edmondson
2012-01-24 12:53 ` optional hiding of some part headers v3 David Edmondson
2012-01-24 12:53 ` [PATCH 1/3] emacs: Don't return the button from `notmuch-show-insert-part-header' David Edmondson
2012-01-24 18:46 ` Jameson Graef Rollins
2012-01-24 19:25 ` David Edmondson
2012-01-24 19:52 ` Jameson Graef Rollins
2012-01-25 6:15 ` David Edmondson
2012-01-24 19:33 ` Tomi Ollila
2012-01-24 12:53 ` [PATCH 2/3] emacs: Optionally hide some part headers David Edmondson
2012-01-24 19:34 ` Tomi Ollila
2012-01-24 12:53 ` [PATCH 3/3] emacs: Don't insert a part header if it's the first part and text/* David Edmondson
2012-01-24 19:46 ` Tomi Ollila
2012-02-06 15:39 ` [PATCH v3 0/3] part header code tidying and options David Edmondson
2012-02-06 15:39 ` [PATCH v2] emacs: Add more processing of displayed headers David Edmondson
2012-02-14 12:30 ` David Bremner
2012-02-14 13:28 ` David Edmondson
2012-10-12 19:11 ` Ethan Glasser-Camp
2012-02-06 15:39 ` [PATCH v3 1/3] emacs: Don't return the button from `notmuch-show-insert-part-header' David Edmondson
2012-02-06 15:39 ` [PATCH v3 2/3] emacs: Optionally hide some part headers David Edmondson
2012-02-12 9:21 ` Mark Walters
2012-02-06 15:39 ` [PATCH v3 3/3] emacs: Don't insert a part header if it's the first part and text/* David Edmondson
2012-02-12 9:24 ` Mark Walters
2012-02-12 9:39 ` Mark Walters
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327314784-22555-1-git-send-email-dme@dme.org \
--to=dme@dme.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).