[PATCH] emacs: Reuse rather than reinvent message header filtering

[PATCH] emacs: Reuse rather than reinvent message header filtering

[Sebastian Spaeth]

In notmuch-mua-reply we were filtering out the Subject and To headers
manually in a loop, but message mode offers a nice function for
exactly that. Simplify the code by using that. Also, as
notmuch-mua-mail already sorts and hides headers that we want sorted
and hidden, we can safely remove those 2 functions from here as well.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---
 emacs/notmuch-mua.el |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index bd06e3c..6318c15 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -92,12 +92,7 @@ list."
 	((same-window-regexps '("\\*mail .*")))
       (notmuch-mua-mail (mail-header 'to headers)
 			(mail-header 'subject headers)
-			(loop for header in headers
-			      if (not (or (eq 'to (car header))
-					  (eq 'subject (car header))))
-			      collect header)))
-    (message-sort-headers)
-    (message-hide-headers)
+			(message-headers-to-generate headers t '(to subject))))
     ;; insert the message body - but put it in front of the signature
     ;; if one is present
     (goto-char (point-max))
-- 
1.7.0.4

Re: [PATCH] emacs: Reuse rather than reinvent message header filtering

[David Edmondson]

[-- Attachment #1: Type: text/plain, Size: 653 bytes --]

On Thu, 29 Apr 2010 10:47:55 +0200, Sebastian Spaeth <Sebastian@SSpaeth.de> wrote:
> In notmuch-mua-reply we were filtering out the Subject and To headers
> manually in a loop, but message mode offers a nice function for
> exactly that. Simplify the code by using that. Also, as
> notmuch-mua-mail already sorts and hides headers that we want sorted
> and hidden, we can safely remove those 2 functions from here as well.
> 
> Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>

This looks fine to me (I even tested!).

We can also remove "(require 'cl)" now that the use of `loop' is gone.

dme.
-- 
David Edmondson, http://dme.org

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

[PATCH v2] emacs: Reuse rather than reinvent message header filtering

[Sebastian Spaeth]

In notmuch-mua-reply we were filtering out the Subject and To headers
manually in a loop, but message mode offers a nice function for
exactly that. Simplify the code by using it. Also, as notmuch-mua-mail
already sorts and hides headers that we want sorted and hidden, we can
safely remove those 2 functions from here as well.  Also remove the
(require 'cl), the only reason for its existence was the now removed
"loop" function.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---
 Also removed (require 'cl) as per dme's suggestion.

 emacs/notmuch-mua.el |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index bd06e3c..0975fe6 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -19,7 +19,6 @@
 ;;
 ;; Authors: David Edmondson <dme@dme.org>
 
-(require 'cl)
 (require 'message)
 
 (require 'notmuch-lib)
@@ -92,12 +91,7 @@ list."
 	((same-window-regexps '("\\*mail .*")))
       (notmuch-mua-mail (mail-header 'to headers)
 			(mail-header 'subject headers)
-			(loop for header in headers
-			      if (not (or (eq 'to (car header))
-					  (eq 'subject (car header))))
-			      collect header)))
-    (message-sort-headers)
-    (message-hide-headers)
+			(message-headers-to-generate headers t '(to subject))))
     ;; insert the message body - but put it in front of the signature
     ;; if one is present
     (goto-char (point-max))
-- 
1.7.0.4

Re: [PATCH v2] emacs: Reuse rather than reinvent message header filtering

[Carl Worth]

[-- Attachment #1: Type: text/plain, Size: 824 bytes --]

On Thu, 29 Apr 2010 11:10:01 +0200, Sebastian Spaeth <Sebastian@SSpaeth.de> wrote:
> In notmuch-mua-reply we were filtering out the Subject and To headers
> manually in a loop, but message mode offers a nice function for
> exactly that. Simplify the code by using it. Also, as notmuch-mua-mail
> already sorts and hides headers that we want sorted and hidden, we can
> safely remove those 2 functions from here as well.  Also remove the
> (require 'cl), the only reason for its existence was the now removed
> "loop" function.
> 
> Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
> ---
>  Also removed (require 'cl) as per dme's suggestion.

Lovely. Thanks for the patch, Sebastian, (and for the review, David).

I've committed this and expect to push it soon.

-Carl

-- 
carl.d.worth@intel.com

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]