[PATCH v7 1/8] emacs: Rework crypto switch toggle.
On Wed, 8 Feb 2012 00:10:16 -0500, Austin Clements wrote:
> Seems reasonable. I'm definitely in favor of erasing buffers instead
> of killing and recreating them. Two questions below.
Thanks for the review.
> Quoth David Edmondson on Feb 06 at 9:21 am:
> > Re-work the existing crypto switch toggle to be based on a persistant
> > buffer-local variable.
> >
> > To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
> > in the current buffer rather than killing the current buffer and
> > creating a new one. (This will also allow more per-buffer behaviour in
> > future patches.)
> >
> > Add a binding ('$') to toggle crypto processing of the current buffer
> > and remove the prefix argument approach that achieves a similar
> > result.
> > ---
> > emacs/notmuch-show.el | 126
> >
> > emacs/notmuch.el |7 +--
> > 2 files changed, 66 insertions(+), 67 deletions(-)
> >
> > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> > index 7469e2e..4b29dbd 100644
> > --- a/emacs/notmuch-show.el
> > +++ b/emacs/notmuch-show.el
> > @@ -125,6 +125,22 @@ indentation."
> > (const :tag "View interactively"
> > notmuch-show-interactively-view-part)))
> >
> > +(defvar notmuch-show-thread-id nil)
> > +(make-variable-buffer-local 'notmuch-show-thread-id)
> > +(put 'notmuch-show-thread-id 'permanent-local t)
> > +
> > +(defvar notmuch-show-parent-buffer nil)
> > +(make-variable-buffer-local 'notmuch-show-parent-buffer)
> > +(put 'notmuch-show-parent-buffer 'permanent-local t)
> > +
> > +(defvar notmuch-show-query-context nil)
> > +(make-variable-buffer-local 'notmuch-show-query-context)
> > +(put 'notmuch-show-query-context 'permanent-local t)
> > +
> > +(defvar notmuch-show-process-crypto nil)
> > +(make-variable-buffer-local 'notmuch-show-process-crypto)
> > +(put 'notmuch-show-process-crypto 'permanent-local t)
> > +
>
> Do these need to be permanent-local given that refreshing is now done
> by erasing the buffer instead of killing it?
Yes. `notmuch-show-worker' (which does the refreshing) still calls
`notmuch-show-mode', which still calls `kill-all-local-variables'.
Tidying that is for another patch.
> > (defmacro with-current-notmuch-show-message (&rest body)
> >"Evaluate body with current buffer set to the text of current message"
> >`(save-excursion
> > @@ -421,14 +437,11 @@ message at DEPTH in the current thread."
> >
> > (defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
> >(declare (indent 2))
> > - (let ((process-crypto (make-symbol "process-crypto")))
> > -`(let ((,process-crypto notmuch-show-process-crypto))
> > - (with-temp-buffer
> > -(setq notmuch-show-process-crypto ,process-crypto)
> > -;; Always acquires the part via `notmuch part', even if it is
> > -;; available in the JSON output.
> > -(insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> > -, at body
> > + `(with-temp-buffer
> > + ;; Always acquires the part via `notmuch part', even if it is
> > + ;; available in the JSON output.
> > + (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> > + , at body))
>
> Why is the piping of notmuch-show-process-crypto no longer necessary?
> It's still buffer-local, and hence will be nil in the temp buffer.
It's a bug. v8 after breakfast.
> >
> > (defun notmuch-show-save-part (message-id nth &optional filename
> > content-type)
> >(notmuch-with-temp-part-buffer message-id nth
> > @@ -610,7 +623,7 @@ current buffer, if possible."
> >(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.")))
> > + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> > process cryptographic MIME parts.")))
> >
> >(let ((inner-parts (plist-get part :content))
> > (start (point)))
> > @@ -636,7 +649,7 @@ current buffer, if possible."
> > (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.")))
> > + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> > process cryptographic MIME parts.")))
> >
> >(let ((inner-parts (plist-get part :content))
> > (start (point)))
> > @@ -763,8 +776,6 @@ current buffer, if possible."
> >
> > ;; Helper for parts which are generally not included in the default
> > ;; JSON output.
> > -;; Uses the buffer-local variable notmuch-show-process-crypto to
> > -;; determine
[PATCH v7 1/8] emacs: Rework crypto switch toggle.
Seems reasonable. I'm definitely in favor of erasing buffers instead
of killing and recreating them. Two questions below.
Quoth David Edmondson on Feb 06 at 9:21 am:
> Re-work the existing crypto switch toggle to be based on a persistant
> buffer-local variable.
>
> To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
> in the current buffer rather than killing the current buffer and
> creating a new one. (This will also allow more per-buffer behaviour in
> future patches.)
>
> Add a binding ('$') to toggle crypto processing of the current buffer
> and remove the prefix argument approach that achieves a similar
> result.
> ---
> emacs/notmuch-show.el | 126
> emacs/notmuch.el |7 +--
> 2 files changed, 66 insertions(+), 67 deletions(-)
>
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index 7469e2e..4b29dbd 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -125,6 +125,22 @@ indentation."
>(const :tag "View interactively"
> notmuch-show-interactively-view-part)))
>
> +(defvar notmuch-show-thread-id nil)
> +(make-variable-buffer-local 'notmuch-show-thread-id)
> +(put 'notmuch-show-thread-id 'permanent-local t)
> +
> +(defvar notmuch-show-parent-buffer nil)
> +(make-variable-buffer-local 'notmuch-show-parent-buffer)
> +(put 'notmuch-show-parent-buffer 'permanent-local t)
> +
> +(defvar notmuch-show-query-context nil)
> +(make-variable-buffer-local 'notmuch-show-query-context)
> +(put 'notmuch-show-query-context 'permanent-local t)
> +
> +(defvar notmuch-show-process-crypto nil)
> +(make-variable-buffer-local 'notmuch-show-process-crypto)
> +(put 'notmuch-show-process-crypto 'permanent-local t)
> +
Do these need to be permanent-local given that refreshing is now done
by erasing the buffer instead of killing it?
> (defmacro with-current-notmuch-show-message (&rest body)
>"Evaluate body with current buffer set to the text of current message"
>`(save-excursion
> @@ -421,14 +437,11 @@ message at DEPTH in the current thread."
>
> (defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
>(declare (indent 2))
> - (let ((process-crypto (make-symbol "process-crypto")))
> -`(let ((,process-crypto notmuch-show-process-crypto))
> - (with-temp-buffer
> - (setq notmuch-show-process-crypto ,process-crypto)
> - ;; Always acquires the part via `notmuch part', even if it is
> - ;; available in the JSON output.
> - (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> - , at body
> + `(with-temp-buffer
> + ;; Always acquires the part via `notmuch part', even if it is
> + ;; available in the JSON output.
> + (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> + , at body))
Why is the piping of notmuch-show-process-crypto no longer necessary?
It's still buffer-local, and hence will be nil in the temp buffer.
>
> (defun notmuch-show-save-part (message-id nth &optional filename
> content-type)
>(notmuch-with-temp-part-buffer message-id nth
> @@ -610,7 +623,7 @@ current buffer, if possible."
> (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.")))
> + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> process cryptographic MIME parts.")))
>
>(let ((inner-parts (plist-get part :content))
> (start (point)))
> @@ -636,7 +649,7 @@ current buffer, if possible."
>(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.")))
> + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> process cryptographic MIME parts.")))
>
>(let ((inner-parts (plist-get part :content))
> (start (point)))
> @@ -763,8 +776,6 @@ current buffer, if possible."
>
> ;; Helper for parts which are generally not included in the default
> ;; JSON output.
> -;; Uses the buffer-local variable notmuch-show-process-crypto to
> -;; determine if parts should be decrypted first.
> (defun notmuch-show-get-bodypart-internal (message-id part-number)
>(let ((args '("show" "--format=raw"))
> (part-arg (format "--part=%s" part-number)))
> @@ -918,6 +929,15 @@ current buffer, if possible."
> ;; criteria.
> (notmuch-show-message-visible msg (plist-get msg :match
>
> +(defun notmuch-show-toggle-process-crypto ()
> + "Toggle the processing of cryptographic MIME parts."
> + (interactiv
Re: [PATCH v7 1/8] emacs: Rework crypto switch toggle.
On Wed, 8 Feb 2012 00:10:16 -0500, Austin Clements wrote:
> Seems reasonable. I'm definitely in favor of erasing buffers instead
> of killing and recreating them. Two questions below.
Thanks for the review.
> Quoth David Edmondson on Feb 06 at 9:21 am:
> > Re-work the existing crypto switch toggle to be based on a persistant
> > buffer-local variable.
> >
> > To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
> > in the current buffer rather than killing the current buffer and
> > creating a new one. (This will also allow more per-buffer behaviour in
> > future patches.)
> >
> > Add a binding ('$') to toggle crypto processing of the current buffer
> > and remove the prefix argument approach that achieves a similar
> > result.
> > ---
> > emacs/notmuch-show.el | 126
> >
> > emacs/notmuch.el |7 +--
> > 2 files changed, 66 insertions(+), 67 deletions(-)
> >
> > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> > index 7469e2e..4b29dbd 100644
> > --- a/emacs/notmuch-show.el
> > +++ b/emacs/notmuch-show.el
> > @@ -125,6 +125,22 @@ indentation."
> > (const :tag "View interactively"
> > notmuch-show-interactively-view-part)))
> >
> > +(defvar notmuch-show-thread-id nil)
> > +(make-variable-buffer-local 'notmuch-show-thread-id)
> > +(put 'notmuch-show-thread-id 'permanent-local t)
> > +
> > +(defvar notmuch-show-parent-buffer nil)
> > +(make-variable-buffer-local 'notmuch-show-parent-buffer)
> > +(put 'notmuch-show-parent-buffer 'permanent-local t)
> > +
> > +(defvar notmuch-show-query-context nil)
> > +(make-variable-buffer-local 'notmuch-show-query-context)
> > +(put 'notmuch-show-query-context 'permanent-local t)
> > +
> > +(defvar notmuch-show-process-crypto nil)
> > +(make-variable-buffer-local 'notmuch-show-process-crypto)
> > +(put 'notmuch-show-process-crypto 'permanent-local t)
> > +
>
> Do these need to be permanent-local given that refreshing is now done
> by erasing the buffer instead of killing it?
Yes. `notmuch-show-worker' (which does the refreshing) still calls
`notmuch-show-mode', which still calls `kill-all-local-variables'.
Tidying that is for another patch.
> > (defmacro with-current-notmuch-show-message (&rest body)
> >"Evaluate body with current buffer set to the text of current message"
> >`(save-excursion
> > @@ -421,14 +437,11 @@ message at DEPTH in the current thread."
> >
> > (defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
> >(declare (indent 2))
> > - (let ((process-crypto (make-symbol "process-crypto")))
> > -`(let ((,process-crypto notmuch-show-process-crypto))
> > - (with-temp-buffer
> > -(setq notmuch-show-process-crypto ,process-crypto)
> > -;; Always acquires the part via `notmuch part', even if it is
> > -;; available in the JSON output.
> > -(insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> > -,@body
> > + `(with-temp-buffer
> > + ;; Always acquires the part via `notmuch part', even if it is
> > + ;; available in the JSON output.
> > + (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> > + ,@body))
>
> Why is the piping of notmuch-show-process-crypto no longer necessary?
> It's still buffer-local, and hence will be nil in the temp buffer.
It's a bug. v8 after breakfast.
> >
> > (defun notmuch-show-save-part (message-id nth &optional filename
> > content-type)
> >(notmuch-with-temp-part-buffer message-id nth
> > @@ -610,7 +623,7 @@ current buffer, if possible."
> >(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.")))
> > + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> > process cryptographic MIME parts.")))
> >
> >(let ((inner-parts (plist-get part :content))
> > (start (point)))
> > @@ -636,7 +649,7 @@ current buffer, if possible."
> > (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.")))
> > + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> > process cryptographic MIME parts.")))
> >
> >(let ((inner-parts (plist-get part :content))
> > (start (point)))
> > @@ -763,8 +776,6 @@ current buffer, if possible."
> >
> > ;; Helper for parts which are generally not included in the default
> > ;; JSON output.
> > -;; Uses the buffer-local variable notmuch-show-process-crypto to
> > -;; determine if par
Re: [PATCH v7 1/8] emacs: Rework crypto switch toggle.
Seems reasonable. I'm definitely in favor of erasing buffers instead
of killing and recreating them. Two questions below.
Quoth David Edmondson on Feb 06 at 9:21 am:
> Re-work the existing crypto switch toggle to be based on a persistant
> buffer-local variable.
>
> To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
> in the current buffer rather than killing the current buffer and
> creating a new one. (This will also allow more per-buffer behaviour in
> future patches.)
>
> Add a binding ('$') to toggle crypto processing of the current buffer
> and remove the prefix argument approach that achieves a similar
> result.
> ---
> emacs/notmuch-show.el | 126
> emacs/notmuch.el |7 +--
> 2 files changed, 66 insertions(+), 67 deletions(-)
>
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index 7469e2e..4b29dbd 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -125,6 +125,22 @@ indentation."
>(const :tag "View interactively"
> notmuch-show-interactively-view-part)))
>
> +(defvar notmuch-show-thread-id nil)
> +(make-variable-buffer-local 'notmuch-show-thread-id)
> +(put 'notmuch-show-thread-id 'permanent-local t)
> +
> +(defvar notmuch-show-parent-buffer nil)
> +(make-variable-buffer-local 'notmuch-show-parent-buffer)
> +(put 'notmuch-show-parent-buffer 'permanent-local t)
> +
> +(defvar notmuch-show-query-context nil)
> +(make-variable-buffer-local 'notmuch-show-query-context)
> +(put 'notmuch-show-query-context 'permanent-local t)
> +
> +(defvar notmuch-show-process-crypto nil)
> +(make-variable-buffer-local 'notmuch-show-process-crypto)
> +(put 'notmuch-show-process-crypto 'permanent-local t)
> +
Do these need to be permanent-local given that refreshing is now done
by erasing the buffer instead of killing it?
> (defmacro with-current-notmuch-show-message (&rest body)
>"Evaluate body with current buffer set to the text of current message"
>`(save-excursion
> @@ -421,14 +437,11 @@ message at DEPTH in the current thread."
>
> (defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
>(declare (indent 2))
> - (let ((process-crypto (make-symbol "process-crypto")))
> -`(let ((,process-crypto notmuch-show-process-crypto))
> - (with-temp-buffer
> - (setq notmuch-show-process-crypto ,process-crypto)
> - ;; Always acquires the part via `notmuch part', even if it is
> - ;; available in the JSON output.
> - (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> - ,@body
> + `(with-temp-buffer
> + ;; Always acquires the part via `notmuch part', even if it is
> + ;; available in the JSON output.
> + (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
> + ,@body))
Why is the piping of notmuch-show-process-crypto no longer necessary?
It's still buffer-local, and hence will be nil in the temp buffer.
>
> (defun notmuch-show-save-part (message-id nth &optional filename
> content-type)
>(notmuch-with-temp-part-buffer message-id nth
> @@ -610,7 +623,7 @@ current buffer, if possible."
> (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.")))
> + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> process cryptographic MIME parts.")))
>
>(let ((inner-parts (plist-get part :content))
> (start (point)))
> @@ -636,7 +649,7 @@ current buffer, if possible."
>(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.")))
> + (button-put button 'help-echo "Set notmuch-crypto-process-mime to
> process cryptographic MIME parts.")))
>
>(let ((inner-parts (plist-get part :content))
> (start (point)))
> @@ -763,8 +776,6 @@ current buffer, if possible."
>
> ;; Helper for parts which are generally not included in the default
> ;; JSON output.
> -;; Uses the buffer-local variable notmuch-show-process-crypto to
> -;; determine if parts should be decrypted first.
> (defun notmuch-show-get-bodypart-internal (message-id part-number)
>(let ((args '("show" "--format=raw"))
> (part-arg (format "--part=%s" part-number)))
> @@ -918,6 +929,15 @@ current buffer, if possible."
> ;; criteria.
> (notmuch-show-message-visible msg (plist-get msg :match
>
> +(defun notmuch-show-toggle-process-crypto ()
> + "Toggle the processing of cryptographic MIME parts."
> + (interactive)
> +
[PATCH v7 1/8] emacs: Rework crypto switch toggle.
Re-work the existing crypto switch toggle to be based on a persistant
buffer-local variable.
To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
in the current buffer rather than killing the current buffer and
creating a new one. (This will also allow more per-buffer behaviour in
future patches.)
Add a binding ('$') to toggle crypto processing of the current buffer
and remove the prefix argument approach that achieves a similar
result.
---
emacs/notmuch-show.el | 126
emacs/notmuch.el |7 +--
2 files changed, 66 insertions(+), 67 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 7469e2e..4b29dbd 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -125,6 +125,22 @@ indentation."
(const :tag "View interactively"
notmuch-show-interactively-view-part)))
+(defvar notmuch-show-thread-id nil)
+(make-variable-buffer-local 'notmuch-show-thread-id)
+(put 'notmuch-show-thread-id 'permanent-local t)
+
+(defvar notmuch-show-parent-buffer nil)
+(make-variable-buffer-local 'notmuch-show-parent-buffer)
+(put 'notmuch-show-parent-buffer 'permanent-local t)
+
+(defvar notmuch-show-query-context nil)
+(make-variable-buffer-local 'notmuch-show-query-context)
+(put 'notmuch-show-query-context 'permanent-local t)
+
+(defvar notmuch-show-process-crypto nil)
+(make-variable-buffer-local 'notmuch-show-process-crypto)
+(put 'notmuch-show-process-crypto 'permanent-local t)
+
(defmacro with-current-notmuch-show-message (&rest body)
"Evaluate body with current buffer set to the text of current message"
`(save-excursion
@@ -421,14 +437,11 @@ message at DEPTH in the current thread."
(defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
(declare (indent 2))
- (let ((process-crypto (make-symbol "process-crypto")))
-`(let ((,process-crypto notmuch-show-process-crypto))
- (with-temp-buffer
-(setq notmuch-show-process-crypto ,process-crypto)
-;; Always acquires the part via `notmuch part', even if it is
-;; available in the JSON output.
-(insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
-, at body
+ `(with-temp-buffer
+ ;; Always acquires the part via `notmuch part', even if it is
+ ;; available in the JSON output.
+ (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
+ , at body))
(defun notmuch-show-save-part (message-id nth &optional filename content-type)
(notmuch-with-temp-part-buffer message-id nth
@@ -610,7 +623,7 @@ current buffer, if possible."
(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.")))
+ (button-put button 'help-echo "Set notmuch-crypto-process-mime to
process cryptographic MIME parts.")))
(let ((inner-parts (plist-get part :content))
(start (point)))
@@ -636,7 +649,7 @@ current buffer, if possible."
(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.")))
+ (button-put button 'help-echo "Set notmuch-crypto-process-mime to
process cryptographic MIME parts.")))
(let ((inner-parts (plist-get part :content))
(start (point)))
@@ -763,8 +776,6 @@ current buffer, if possible."
;; Helper for parts which are generally not included in the default
;; JSON output.
-;; Uses the buffer-local variable notmuch-show-process-crypto to
-;; determine if parts should be decrypted first.
(defun notmuch-show-get-bodypart-internal (message-id part-number)
(let ((args '("show" "--format=raw"))
(part-arg (format "--part=%s" part-number)))
@@ -918,6 +929,15 @@ current buffer, if possible."
;; criteria.
(notmuch-show-message-visible msg (plist-get msg :match
+(defun notmuch-show-toggle-process-crypto ()
+ "Toggle the processing of cryptographic MIME parts."
+ (interactive)
+ (setq notmuch-show-process-crypto (not notmuch-show-process-crypto))
+ (message (if notmuch-show-process-crypto
+ "Processing cryptographic MIME parts."
+"Not processing cryptographic MIME parts."))
+ (notmuch-show-refresh-view))
+
(defun notmuch-show-insert-tree (tree depth)
"Insert the message tree TREE at depth DEPTH in the current thread."
(let ((msg (car tree))
@@ -933,15 +953,6 @@ current buffer, if possible."
"Insert the forest of threads FOREST."
(mapc (lambda (thread) (notmuch-show-insert-thread thread 0)) forest))
-(defvar notmuch-show-thread-id n
[PATCH v7 1/8] emacs: Rework crypto switch toggle.
Re-work the existing crypto switch toggle to be based on a persistant
buffer-local variable.
To allow this, modify `notmuch-show-refresh-view' to erase and re-draw
in the current buffer rather than killing the current buffer and
creating a new one. (This will also allow more per-buffer behaviour in
future patches.)
Add a binding ('$') to toggle crypto processing of the current buffer
and remove the prefix argument approach that achieves a similar
result.
---
emacs/notmuch-show.el | 126
emacs/notmuch.el |7 +--
2 files changed, 66 insertions(+), 67 deletions(-)
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 7469e2e..4b29dbd 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -125,6 +125,22 @@ indentation."
(const :tag "View interactively"
notmuch-show-interactively-view-part)))
+(defvar notmuch-show-thread-id nil)
+(make-variable-buffer-local 'notmuch-show-thread-id)
+(put 'notmuch-show-thread-id 'permanent-local t)
+
+(defvar notmuch-show-parent-buffer nil)
+(make-variable-buffer-local 'notmuch-show-parent-buffer)
+(put 'notmuch-show-parent-buffer 'permanent-local t)
+
+(defvar notmuch-show-query-context nil)
+(make-variable-buffer-local 'notmuch-show-query-context)
+(put 'notmuch-show-query-context 'permanent-local t)
+
+(defvar notmuch-show-process-crypto nil)
+(make-variable-buffer-local 'notmuch-show-process-crypto)
+(put 'notmuch-show-process-crypto 'permanent-local t)
+
(defmacro with-current-notmuch-show-message (&rest body)
"Evaluate body with current buffer set to the text of current message"
`(save-excursion
@@ -421,14 +437,11 @@ message at DEPTH in the current thread."
(defmacro notmuch-with-temp-part-buffer (message-id nth &rest body)
(declare (indent 2))
- (let ((process-crypto (make-symbol "process-crypto")))
-`(let ((,process-crypto notmuch-show-process-crypto))
- (with-temp-buffer
-(setq notmuch-show-process-crypto ,process-crypto)
-;; Always acquires the part via `notmuch part', even if it is
-;; available in the JSON output.
-(insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
-,@body
+ `(with-temp-buffer
+ ;; Always acquires the part via `notmuch part', even if it is
+ ;; available in the JSON output.
+ (insert (notmuch-show-get-bodypart-internal ,message-id ,nth))
+ ,@body))
(defun notmuch-show-save-part (message-id nth &optional filename content-type)
(notmuch-with-temp-part-buffer message-id nth
@@ -610,7 +623,7 @@ current buffer, if possible."
(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.")))
+ (button-put button 'help-echo "Set notmuch-crypto-process-mime to
process cryptographic MIME parts.")))
(let ((inner-parts (plist-get part :content))
(start (point)))
@@ -636,7 +649,7 @@ current buffer, if possible."
(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.")))
+ (button-put button 'help-echo "Set notmuch-crypto-process-mime to
process cryptographic MIME parts.")))
(let ((inner-parts (plist-get part :content))
(start (point)))
@@ -763,8 +776,6 @@ current buffer, if possible."
;; Helper for parts which are generally not included in the default
;; JSON output.
-;; Uses the buffer-local variable notmuch-show-process-crypto to
-;; determine if parts should be decrypted first.
(defun notmuch-show-get-bodypart-internal (message-id part-number)
(let ((args '("show" "--format=raw"))
(part-arg (format "--part=%s" part-number)))
@@ -918,6 +929,15 @@ current buffer, if possible."
;; criteria.
(notmuch-show-message-visible msg (plist-get msg :match
+(defun notmuch-show-toggle-process-crypto ()
+ "Toggle the processing of cryptographic MIME parts."
+ (interactive)
+ (setq notmuch-show-process-crypto (not notmuch-show-process-crypto))
+ (message (if notmuch-show-process-crypto
+ "Processing cryptographic MIME parts."
+"Not processing cryptographic MIME parts."))
+ (notmuch-show-refresh-view))
+
(defun notmuch-show-insert-tree (tree depth)
"Insert the message tree TREE at depth DEPTH in the current thread."
(let ((msg (car tree))
@@ -933,15 +953,6 @@ current buffer, if possible."
"Insert the forest of threads FOREST."
(mapc (lambda (thread) (notmuch-show-insert-thread thread 0)) forest))
-(defvar notmuch-show-thread-id
