[PATCH v2 2/2] emacs: Expand default saved searches and add shortcut keys

diff --git a/f2/33e41b49c6213468a2f31b1889d240f8454a4d b/f2/33e41b49c6213468a2f31b1889d240f8454a4d
new file mode 100644 (file)
index 0000000..620aa35
--- /dev/null
+++ b/f2/33e41b49c6213468a2f31b1889d240f8454a4d
@@ -0,0 +1,137 @@
+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 F0DFE431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 07:06:33 -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 aBBMy4qjJJG1 for <notmuch@notmuchmail.org>;\r
+       Tue, 15 Jul 2014 07:06:28 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-6.mit.edu (dmz-mailsec-scanner-6.mit.edu\r
+       [18.7.68.35])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id AC0A5431FC3\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Jul 2014 07:06:23 -0700 (PDT)\r
+X-AuditID: 12074423-f79bf6d000007580-25-53c5355e391c\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 29.09.30080.F5535C35; Tue, 15 Jul 2014 10:06:23 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s6FE6GIx018306; \r
+       Tue, 15 Jul 2014 10:06:16 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (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 s6FE6Djl008839\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Tue, 15 Jul 2014 10:06:15 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1X73Mx-0000h4-MW; Tue, 15 Jul 2014 10:06:11 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/2] emacs: Expand default saved searches and add shortcut\r
+       keys\r
+Date: Tue, 15 Jul 2014 10:06:06 -0400\r
+Message-Id: <1405433166-2198-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1405433166-2198-1-git-send-email-amdragon@mit.edu>\r
+References: <1405353735-26244-1-git-send-email-amdragon@mit.edu>\r
+       <1405433166-2198-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrPIsWRmVeSWpSXmKPExsUixCmqrRtvejTY4NUXFosbrd2MFvvubGGy\r
+       WD2Xx+L6zZnMDiweu57/ZfLYOesuu8ezVbeYPbYces8cwBLFZZOSmpNZllqkb5fAlbF22VrG\r
+       gu1CFTsW3mZqYLzO28XIwSEhYCJxZ5lZFyMnkCkmceHeerYuRi4OIYHZTBInbz1mgXA2Mkoc\r
+       erCQEcK5wySx6P89dghnLqPErH1T2ED62QQ0JLbtX84IYosISEvsvDubFcRmFsiS2PDyIDPI\r
+       OmGBIIkpb+pBwiwCqhLN684yg9i8AvYSn9bdZIE4Q06i4cYnsJGcAg4SH7f+BrOFBMoknuw7\r
+       yDqBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXTO93MwSvdSU0k2MoHBjd1HewfjnoNIh\r
+       RgEORiUeXol3h4OFWBPLiitzDzFKcjApifIWsx0NFuJLyk+pzEgszogvKs1JLT7EKMHBrCTC\r
+       K2kClONNSaysSi3Kh0lJc7AoifO+tbYKFhJITyxJzU5NLUgtgsnKcHAoSfAygzQKFqWmp1ak\r
+       ZeaUIKSZODhBhvMADecFG15ckJhbnJkOkT/FqCglznvCGCghAJLIKM2D64Wlg1eM4kCvCPNe\r
+       AaniAaYSuO5XQIOZgAaX1xwGGVySiJCSamDczCkirv1VSOI8++0f8/6dqJXPux8gI5FWN1lP\r
+       yMvlVZSIQoK9R9T0Bpf/+tUGdy4eOnRmInPHv2+qnBoy3WzmLGfu7/HrZds+QVDKXl7F2OiU\r
+       S46nxdSa1xPXqcrmsn6+6Pyx8CSLWTzXBn/GbRJH7MJ1JcIUV7BdC4/qun09uoFdJDT7jxJL\r
+       cUaioRZzUXEiAJX+4GLiAgAA\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, 15 Jul 2014 14:06:34 -0000\r
+\r
+This should help new users off to a better start with the addition of\r
+more sensible saved searches and default shortcut keys.  Most existing\r
+users have probably customized this variable and won't be affected.\r
+---\r
+ emacs/notmuch-hello.el                              | 9 +++++++--\r
+ test/emacs.expected-output/notmuch-hello            | 2 +-\r
+ test/emacs.expected-output/notmuch-hello-long-names | 2 +-\r
+ 3 files changed, 9 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 061b27d..65d0627 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -93,8 +93,13 @@ (define-widget 'notmuch-saved-search-plist 'list\r
+                                   (const :tag "Oldest-first" oldest-first)\r
+                                   (const :tag "Newest-first" newest-first))))))\r
+ \r
+-(defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox")\r
+-                                  (:name "unread" :query "tag:unread"))\r
++(defcustom notmuch-saved-searches\r
++  `((:name "inbox" :query "tag:inbox" :key ,(kbd "i"))\r
++    (:name "unread" :query "tag:unread" :key ,(kbd "u"))\r
++    (:name "flagged" :query "tag:flagged" :key ,(kbd "f"))\r
++    (:name "sent" :query "tag:sent" :key ,(kbd "t"))\r
++    (:name "drafts" :query "tag:draft" :key ,(kbd "d"))\r
++    (:name "all mail" :query "*" :key ,(kbd "a")))\r
+   "A list of saved searches to display.\r
+ \r
+ The saved search can be given in 3 forms. The preferred way is as\r
+diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello\r
+index 2d69891..9ba4cfc 100644\r
+--- a/test/emacs.expected-output/notmuch-hello\r
++++ b/test/emacs.expected-output/notmuch-hello\r
+@@ -2,7 +2,7 @@\r
+ \r
+ Saved searches: [edit]\r
+ \r
+-        52 inbox           52 unread\r
++        52 inbox           52 unread          52 all mail\r
+ \r
+ Search:                                                                     .\r
+ \r
+diff --git a/test/emacs.expected-output/notmuch-hello-long-names b/test/emacs.expected-output/notmuch-hello-long-names\r
+index 486d0d9..1c8d6eb 100644\r
+--- a/test/emacs.expected-output/notmuch-hello-long-names\r
++++ b/test/emacs.expected-output/notmuch-hello-long-names\r
+@@ -2,7 +2,7 @@\r
+ \r
+ Saved searches: [edit]\r
+ \r
+-        52 inbox           52 unread\r
++        52 inbox           52 unread          52 all mail\r
+ \r
+ Search:                                                                     .\r
+ \r
+-- \r
+2.0.0\r
+\r