[PATCH] Restore original keybinding ('r' = reply-to-all)

diff --git a/73/dc1a87f6dc4e5a469f20a5d5814208b0843b55 b/73/dc1a87f6dc4e5a469f20a5d5814208b0843b55
new file mode 100644 (file)
index 0000000..33f9b07
--- /dev/null
+++ b/73/dc1a87f6dc4e5a469f20a5d5814208b0843b55
@@ -0,0 +1,111 @@
+Return-Path: <cworth@cworth.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 55D06431FAF\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Jun 2012 09:45:03 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 kn58lznsirsy for <notmuch@notmuchmail.org>;\r
+       Wed, 27 Jun 2012 09:45:02 -0700 (PDT)\r
+Received: from arlo.cworth.org (arlo.cworth.org [50.43.72.2])\r
+       (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A3EFD431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Jun 2012 09:45:02 -0700 (PDT)\r
+Received: from yoom.amr.corp.intel.com (localhost [127.0.0.1])\r
+       by arlo.cworth.org (Postfix) with ESMTP id 1FEF929A053;\r
+       Wed, 27 Jun 2012 09:45:01 -0700 (PDT)\r
+From: Carl Worth <cworth@cworth.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] Restore original keybinding ('r' = reply-to-all)\r
+Date: Wed, 27 Jun 2012 09:46:05 -0700\r
+Message-Id: <1340815565-21083-1-git-send-email-cworth@cworth.org>\r
+X-Mailer: git-send-email 1.7.10\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, 27 Jun 2012 16:45:03 -0000\r
+\r
+Since the beginning of time, the emacs interface provided a keybinding\r
+of 'r' to reply to a message, (and originally, all recipients).\r
+\r
+Then, before release 0.12 the emacs interface acquired a new\r
+reply-to-sender only feature. In commit\r
+f02b475fa781bb5df3358c73213e7633a99f016e the new feature was put onto\r
+the original keybinding, (and reply-to-all was moved to 'R').\r
+\r
+This restores the original keybinding and uses the new keybinding for\r
+the new feature.\r
+---\r
+\r
+The commit message above motivates this change from the point of view\r
+of interface compatibility. That argument would have been stronger if\r
+I had made it in January, (at the time of the change), rather than\r
+now, (since there's now a new incompatiblity made by changing things\r
+back).\r
+\r
+That said, I still think the compatibility argument is sound.\r
+\r
+I have other feelings as to which reply behavior should be treated\r
+preferentially. But those are potentially more controversial, so I'll\r
+leave the bikeshedding out of our commit history.\r
+\r
+Thanks to everyone keeping notmuch alive and well during my extended\r
+absence from maintainership. What a tremendous free-software success\r
+story this all is. I'm so grateful to all of you.\r
+\r
+-Carl\r
+\r
+ emacs/notmuch-show.el |    4 ++--\r
+ emacs/notmuch.el      |    4 ++--\r
+ 2 files changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 4349836..399a8bd 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1145,8 +1145,8 @@ reset based on the original query."\r
+       (define-key map "s" 'notmuch-search)\r
+       (define-key map "m" 'notmuch-mua-new-mail)\r
+       (define-key map "f" 'notmuch-show-forward-message)\r
+-      (define-key map "r" 'notmuch-show-reply-sender)\r
+-      (define-key map "R" 'notmuch-show-reply)\r
++      (define-key map "r" 'notmuch-show-reply)\r
++      (define-key map "R" 'notmuch-show-reply-sender)\r
+       (define-key map "|" 'notmuch-show-pipe-message)\r
+       (define-key map "w" 'notmuch-show-save-attachments)\r
+       (define-key map "V" 'notmuch-show-view-raw-message)\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index c6236db..3a6b025 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -215,8 +215,8 @@ For a mouse binding, return nil."\r
+     (define-key map ">" 'notmuch-search-last-thread)\r
+     (define-key map "p" 'notmuch-search-previous-thread)\r
+     (define-key map "n" 'notmuch-search-next-thread)\r
+-    (define-key map "r" 'notmuch-search-reply-to-thread-sender)\r
+-    (define-key map "R" 'notmuch-search-reply-to-thread)\r
++    (define-key map "r" 'notmuch-search-reply-to-thread)\r
++    (define-key map "R" 'notmuch-search-reply-to-thread-sender)\r
+     (define-key map "m" 'notmuch-mua-new-mail)\r
+     (define-key map "s" 'notmuch-search)\r
+     (define-key map "o" 'notmuch-search-toggle-order)\r
+-- \r
+1.7.10\r
+\r