[PATCH v2 9/9] emacs: Move ?, q, s, m, =, and G to the common keymap

diff --git a/64/d65ef60b4ac86716ab9d43c57e9697ff536a05 b/64/d65ef60b4ac86716ab9d43c57e9697ff536a05
new file mode 100644 (file)
index 0000000..5745115
--- /dev/null
+++ b/64/d65ef60b4ac86716ab9d43c57e9697ff536a05
@@ -0,0 +1,175 @@
+Return-Path: <amdragon@mit.edu>\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 182E6431E82\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Sep 2013 14:45:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 tK-09TKo+Jne for <notmuch@notmuchmail.org>;\r
+       Tue,  3 Sep 2013 14:45:32 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 8243A431FD6\r
+       for <notmuch@notmuchmail.org>; Tue,  3 Sep 2013 14:45:32 -0700 (PDT)\r
+X-AuditID: 12074425-b7f0c8e000000953-9c-5226587b54af\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 56.EF.02387.B7856225; Tue,  3 Sep 2013 17:45:31 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id r83LjU0t019874; \r
+       Tue, 3 Sep 2013 17:45:31 -0400\r
+Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182])\r
+       (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r83LjRfQ026866\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 3 Sep 2013 17:45:28 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1VGyPf-0004yF-0W; Tue, 03 Sep 2013 17:45:27 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 9/9] emacs: Move ?, q, s, m, =, and G to the common keymap\r
+Date: Tue,  3 Sep 2013 17:45:25 -0400\r
+Message-Id: <1378244725-18846-10-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1378244725-18846-1-git-send-email-amdragon@mit.edu>\r
+References: <1378244725-18846-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrKIsWRmVeSWpSXmKPExsUixG6nolsdoRZk8P2MhUXTdGeL1XN5LK7f\r
+       nMnswOyxc9Zddo9b91+zezxbdYs5gDmKyyYlNSezLLVI3y6BK6PzdgNrwVnViic9a1kaGBfJ\r
+       dzFyckgImEh8/zuRFcIWk7hwbz0biC0ksI9R4tGsmC5GLiB7A6PEhi39rBDOYSaJnWu6mCCc\r
+       uYwSU94vYgdpYRPQkNi2fzkjiC0iIC2x8+5ssLHMAtESRy7PABsrLOArsePjdSYQm0VAVeLk\r
+       1Adg9bwCjhLf7ixjhzhDUaL72QSwek6geO8CiPlCAg4STSsvs09g5F/AyLCKUTYlt0o3NzEz\r
+       pzg1Wbc4OTEvL7VI10IvN7NELzWldBMjOLRcVHcwTjikdIhRgINRiYd3xX3VICHWxLLiytxD\r
+       jJIcTEqivEdC1YKE+JLyUyozEosz4otKc1KLDzFKcDArifAm+ADleFMSK6tSi/JhUtIcLEri\r
+       vM+fng0UEkhPLEnNTk0tSC2CycpwcChJ8K4PB2oULEpNT61Iy8wpQUgzcXCCDOcBGv4SpIa3\r
+       uCAxtzgzHSJ/ilFRSpx3PkhCACSRUZoH1wuL/VeM4kCvCPMeB6niAaYNuO5XQIOZgAanfVYF\r
+       GVySiJCSamD0V97x/d9595s7ZddyeUqdXZh92LM8tDSb2e/qJEkt61vh37ZbnpBKy9Bi+KBS\r
+       4GrzrKcodPr73ls/TzRI+YfOchPQy/y46UNgl+m77wcyk8uStc2sv1/h0RB5Xsp03mjav1Xq\r
+       /jxJAbvPMDl+k09ofLD9jmL1qh0uznMWnmr8cvcqG9+x9p1KLMUZiYZazEXFiQDqZrWX2AIA        AA==\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: Tue, 03 Sep 2013 21:45:41 -0000\r
+\r
+The only user-visible effect of this should be that "G" now works in\r
+show mode (previously it was unbound for no apparent reason).\r
+\r
+This shared keymap gives us one place to put global commands, which\r
+both forces us to think about what commands should be global, and\r
+ensures their bindings can't diverge (like the missing "G" in show).\r
+---\r
+ emacs/notmuch-hello.el |    6 ------\r
+ emacs/notmuch-lib.el   |    6 ++++++\r
+ emacs/notmuch-show.el  |    5 -----\r
+ emacs/notmuch.el       |    6 ------\r
+ 4 files changed, 6 insertions(+), 17 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 46baf55..55c416a 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -525,13 +525,7 @@ Such a list can be computed with `notmuch-hello-query-counts'."\r
+     (set-keymap-parent map notmuch-common-keymap)\r
+     (define-key map "v" (lambda () "Display the notmuch version" (interactive)\r
+                         (message "notmuch version %s" (notmuch-version))))\r
+-    (define-key map "?" 'notmuch-help)\r
+-    (define-key map "q" 'notmuch-kill-this-buffer)\r
+-    (define-key map "=" 'notmuch-refresh-this-buffer)\r
+-    (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)\r
+     (define-key map (kbd "<C-tab>") 'widget-backward)\r
+-    (define-key map "m" 'notmuch-mua-new-mail)\r
+-    (define-key map "s" 'notmuch-search)\r
+     map)\r
+   "Keymap for \"notmuch hello\" buffers.")\r
+ (fset 'notmuch-hello-mode-map notmuch-hello-mode-map)\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 2bf1d2f..58f3313 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -130,6 +130,12 @@ For example, if you wanted to remove an \"inbox\" tag and add an\r
+ \r
+ (defvar notmuch-common-keymap\r
+   (let ((map (make-sparse-keymap)))\r
++    (define-key map "?" 'notmuch-help)\r
++    (define-key map "q" 'notmuch-kill-this-buffer)\r
++    (define-key map "s" 'notmuch-search)\r
++    (define-key map "m" 'notmuch-mua-new-mail)\r
++    (define-key map "=" 'notmuch-refresh-this-buffer)\r
++    (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)\r
+     map)\r
+   "Keymap shared by all notmuch modes.")\r
+ \r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 9f67340..9d8b785 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1265,14 +1265,10 @@ reset based on the original query."\r
+ (defvar notmuch-show-mode-map\r
+       (let ((map (make-sparse-keymap)))\r
+       (set-keymap-parent map notmuch-common-keymap)\r
+-      (define-key map "?" 'notmuch-help)\r
+-      (define-key map "q" 'notmuch-kill-this-buffer)\r
+       (define-key map (kbd "<C-tab>") 'widget-backward)\r
+       (define-key map (kbd "M-TAB") 'notmuch-show-previous-button)\r
+       (define-key map (kbd "<backtab>") 'notmuch-show-previous-button)\r
+       (define-key map (kbd "TAB") 'notmuch-show-next-button)\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
+@@ -1280,7 +1276,6 @@ reset based on the original query."\r
+       (define-key map "w" 'notmuch-show-save-attachments)\r
+       (define-key map "V" 'notmuch-show-view-raw-message)\r
+       (define-key map "c" 'notmuch-show-stash-map)\r
+-      (define-key map "=" 'notmuch-refresh-this-buffer)\r
+       (define-key map "h" 'notmuch-show-toggle-visibility-headers)\r
+       (define-key map "*" 'notmuch-show-tag-all)\r
+       (define-key map "-" 'notmuch-show-remove-tag)\r
+diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
+index e098bd7..4de6229 100644\r
+--- a/emacs/notmuch.el\r
++++ b/emacs/notmuch.el\r
+@@ -199,8 +199,6 @@ first line of documentation for the bound function."\r
+ (defvar notmuch-search-mode-map\r
+   (let ((map (make-sparse-keymap)))\r
+     (set-keymap-parent map notmuch-common-keymap)\r
+-    (define-key map "?" 'notmuch-help)\r
+-    (define-key map "q" 'notmuch-kill-this-buffer)\r
+     (define-key map "x" 'notmuch-kill-this-buffer)\r
+     (define-key map (kbd "<DEL>") 'notmuch-search-scroll-down)\r
+     (define-key map "b" 'notmuch-search-scroll-down)\r
+@@ -211,12 +209,8 @@ first line of documentation for the bound function."\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 "m" 'notmuch-mua-new-mail)\r
+-    (define-key map "s" 'notmuch-search)\r
+     (define-key map "o" 'notmuch-search-toggle-order)\r
+     (define-key map "c" 'notmuch-search-stash-map)\r
+-    (define-key map "=" 'notmuch-refresh-this-buffer)\r
+-    (define-key map "G" 'notmuch-poll-and-refresh-this-buffer)\r
+     (define-key map "t" 'notmuch-search-filter-by-tag)\r
+     (define-key map "f" 'notmuch-search-filter)\r
+     (define-key map [mouse-1] 'notmuch-search-show-thread)\r
+-- \r
+1.7.10.4\r
+\r