[PATCH 1/2] emacs: simplify point placement for inserting message body on reply

diff --git a/61/07a7f7b9c0c7a41fdbda4e2e102c0a147c39c5 b/61/07a7f7b9c0c7a41fdbda4e2e102c0a147c39c5
new file mode 100644 (file)
index 0000000..039bb5a
--- /dev/null
+++ b/61/07a7f7b9c0c7a41fdbda4e2e102c0a147c39c5
@@ -0,0 +1,101 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id C3EE1431FD8\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:30 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id dpRqRtMXJOnD for <notmuch@notmuchmail.org>;\r
+       Wed, 28 Aug 2013 12:34:25 -0700 (PDT)\r
+Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com\r
+ [74.125.83.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 1E921431FC2   for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:25 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f51.google.com with SMTP id c1so3102632eek.24\r
+       for <notmuch@notmuchmail.org>; Wed, 28 Aug 2013 12:34:24 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+       :references:in-reply-to:references;\r
+       bh=na7Yt2RJE3d7DB8es1eC/89Fi+5PAmsy9pl7EStE5y8=;\r
+       b=Z6YEGF0oKzft8xpkNGGxoidV/1ciT1sC1apvglc1JnVIHpHrT9383XBUB3m80+FpKU\r
+       m1uXVLZXy/YMifW3iCfeuYpOhbu1LfSEAThuJBdGrWwt4ahgUGA0+qFUBc6+ucsUeUXO\r
+       WJpDyXSh8Hltncr7V9HlLNpR8cqN2BsL7lYEzEB9JbP9Xddl4nQ7/s77pYUjLJWvLmFm\r
+       baSKzEv86SEk/Cz/HuposUMdS7rjIBGfei8mUc0N6/2lXIx/UyTCe9X5FOUpYY/JEr/I\r
+       evz2llx/Hf4e2wGrhu0dzKW+C47zBP2MnKoZwzmB9UPNmLKCa/LiFTYnH16S10bgrBu9\r
+       Mw/w==\r
+X-Gm-Message-State:\r
+ ALoCoQlkarsH9QFmTan4dkEJIeUgiCnLVdn5njXKrwy3kz3htTJUaBQd9t0m/WES2H6jqz7iPBR0\r
+X-Received: by 10.14.181.132 with SMTP id l4mr3900868eem.77.1377718463853;\r
+       Wed, 28 Aug 2013 12:34:23 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id p5sm40019827eeg.5.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Wed, 28 Aug 2013 12:34:23 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] emacs: simplify point placement for inserting message\r
+       body on reply\r
+Date: Wed, 28 Aug 2013 22:34:21 +0300\r
+Message-Id:\r
+ <26028b45ca200db29feea43176a5a2275232b878.1377718199.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1377718199.git.jani@nikula.org>\r
+References: <cover.1377718199.git.jani@nikula.org>\r
+In-Reply-To: <cover.1377718199.git.jani@nikula.org>\r
+References: <cover.1377718199.git.jani@nikula.org>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>,\r
+       Geoffrey Ferrari <geoffrey.ferrari@oriel.oxon.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Wed, 28 Aug 2013 19:34:31 -0000\r
+\r
+The backwards regexp was most likely just old cruft. Simply put the\r
+point at the beginning of message body. It's guaranteed to be before\r
+the signature.\r
+---\r
+ emacs/notmuch-mua.el |    8 ++------\r
+ 1 file changed, 2 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 2baae5f..a4be394 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -190,12 +190,8 @@ list."\r
+                           (notmuch-headers-plist-to-alist reply-headers)\r
+                           nil (notmuch-mua-get-switch-function))))\r
+ \r
+-      ;; Insert the message body - but put it in front of the signature\r
+-      ;; if one is present\r
+-      (goto-char (point-max))\r
+-      (if (re-search-backward message-signature-separator nil t)\r
+-        (forward-line -1)\r
+-      (goto-char (point-max)))\r
++      ;; Move point to the beginning of the message body.\r
++      (message-goto-body)\r
+ \r
+       (let ((from (plist-get original-headers :From))\r
+           (date (plist-get original-headers :Date))\r
+-- \r
+1.7.10.4\r
+\r