[PATCH] emacs: More DWIM when editing messages

[Dirk Hohndel]

On Mon, 26 Apr 2010 10:28:33 -0700, Carl Worth <cworth at cworth.org> wrote:
> On Mon, 26 Apr 2010 09:31:49 -0700, Dirk Hohndel <hohndel at infradead.org> wrote:
> > On Mon, 26 Apr 2010 15:01:25 +0100, David Edmondson <dme at dme.org> wrote:
> > > For composing new messages and forwarding, leave the cursor on the
> > > 'To:' field. For replies, leave the cursor at the start of the
> > > body. In all cases, mark the buffer as not modified so that the user
> > > is not prompted if she decides to immediately kill the buffer.
> > 
> > YES! Brilliant. I didn't realize how much I wanted it till you sent
> > this. Carl, please include in 0.3
> 
> Agreed! This is *so* pleasant.
> 
> Thanks, David! This is pushed.

And here is the promised fix to get signature in the correct spot:

>From cbd9c96450f6481433877410bcf075d482b4be1b Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <hohndel at infradead.org>
Date: Mon, 26 Apr 2010 10:41:49 -0700
Subject: [PATCH] Put signatures at the very end of the message

The existing code inserts the signature before inserting the message
body (which it puts at the very end of the buffer - therefore AFTER
the signature). This little snippet makes us search backwards and
insert the message body before a signature, if it exists.

This also fixes a small indentation issue in David's code.

Signed-off-by: Dirk Hohndel <hohndel at infradead.org>
---
 emacs/notmuch-mua.el |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c7a9aee..9fbb94a 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -98,11 +98,16 @@ list."
 			      collect header)))
     (message-sort-headers)
     (message-hide-headers)
+    ;; insert the message body - but put it in front of the signature
+    ;; if one is present
     (goto-char (point-max))
+    (if (re-search-backward "-- " nil t)
+	  (forward-line -1)
+      (goto-char (point-max)))
     (insert body))
-    (set-buffer-modified-p nil)
+  (set-buffer-modified-p nil)
 
-    (message-goto-body))
+  (message-goto-body))
 
 (defun notmuch-mua-forward-message ()
   (message-forward)
-- 
1.6.6.1



-- 
Dirk Hohndel
Intel Open Source Technology Center