[PATCH v3 2/8] emacs: break up notmuch-show-archive-thread-internal into two more generally useful functions

[David Edmondson]

On Tue, 24 Jan 2012 16:06:17 -0800, Jameson Graef Rollins <jrollins at finestructure.net> wrote:
> notmuch-show-tag-thread-internal: applies a tag to all messages in
> thread.  If option remove flag is t, tags will be removed instead of
> added.

If it's non-nil, but yes.

> notmuch-show-next-thread: moves to the next thread in the search
> result.  If given a prefix, will show the next result, otherwise will
> just move to it in the search view.
> 
> Two new interactive functions, notmuch-show-{add,remove}-tag-thread,
> are also added.  Together, these provide a better suit of thread
> tagging and navigation tools.
> 
> The higher level thread archiving functions are modified to use these
> new function.
> ---
>  emacs/notmuch-show.el |   46 +++++++++++++++++++++++++++++++++-------------
>  1 files changed, 33 insertions(+), 13 deletions(-)
> 
> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
> index a0045fc..fb908b0 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -1525,20 +1525,38 @@ argument, hide all of the messages."
>    (interactive)
>    (backward-button 1))
>  
> -(defun notmuch-show-archive-thread-internal (show-next)
> -  ;; Remove the tag from the current set of messages.
> +(defun notmuch-show-tag-thread-internal (tag &optional remove)
> +  "Add tag to the current set of messages.

"Add TAG to all messages in the current buffer."

> +
> +If the remove switch is given, tags will be removed instead of
> +added."

"If the REMOVE argument is non-nil, ..."

>    (goto-char (point-min))
> -  (loop do (notmuch-show-remove-tag "inbox")
> -	until (not (notmuch-show-goto-message-next)))
> -  ;; Move to the next item in the search results, if any.
> +  (let ((tag-function (if remove
> +			  'notmuch-show-remove-tag
> +			'notmuch-show-add-tag)))
> +    (loop do (funcall tag-function tag)
> +	  until (not (notmuch-show-goto-message-next)))))

I wonder if we shouldn't have a macro for "do something to all messages
in the current buffer" that could be used more widely.

> +
> +(defun notmuch-show-add-tag-thread (tag)
> +  "Add tag to all messages in the current thread."
> +  (interactive)
> +  (notmuch-show-tag-thread-internal tag))
> +
> +(defun notmuch-show-remove-tag-thread (tag)
> +  "Remove tag from all messages in the current thread."
> +  (interactive)
> +  (notmuch-show-tag-thread-internal tag t))
> +
> +(defun notmuch-show-next-thread (&optional show-next)
> +  "Move to the next item in the search results, if any."

Describe the meaning of SHOW-NEXT.

> +  (interactive "P")
>    (let ((parent-buffer notmuch-show-parent-buffer))
>      (notmuch-kill-this-buffer)
> -    (if parent-buffer
> -	(progn
> -	  (switch-to-buffer parent-buffer)
> -	  (notmuch-search-next-thread)
> -	  (if show-next
> -	      (notmuch-search-show-thread))))))
> +    (when parent-buffer
> +      (switch-to-buffer parent-buffer)
> +      (notmuch-search-next-thread)
> +      (if show-next
> +	  (notmuch-search-show-thread)))))
>  
>  (defun notmuch-show-archive-thread ()
>    "Archive each message in thread, then show next thread from search.
> @@ -1552,12 +1570,14 @@ being delivered to the same thread. It does not archive the
>  entire thread, but only the messages shown in the current
>  buffer."
>    (interactive)
> -  (notmuch-show-archive-thread-internal t))
> +  (notmuch-show-remove-tag-thread "inbox")
> +  (notmuch-show-next-thread t))
>  
>  (defun notmuch-show-archive-thread-then-exit ()
>    "Archive each message in thread, then exit back to search results."
>    (interactive)
> -  (notmuch-show-archive-thread-internal nil))
> +  (notmuch-show-remove-tag-thread "inbox")
> +  (notmuch-show-next-thread))
>  
>  (defun notmuch-show-stash-cc ()
>    "Copy CC field of current message to kill-ring."
> -- 
> 1.7.8.3
> 
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://notmuchmail.org/pipermail/notmuch/attachments/20120125/2ab4f34b/attachment.pgp>