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

diff --git a/44/80303d4efae3d03d6faeff1fd7a4750f136aa6 b/44/80303d4efae3d03d6faeff1fd7a4750f136aa6
new file mode 100644 (file)
index 0000000..a8ba97a
--- /dev/null
+++ b/44/80303d4efae3d03d6faeff1fd7a4750f136aa6
@@ -0,0 +1,135 @@
+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 4D59C431FBD\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Aug 2014 18:45:35 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 CxmgdUKiHX+m for <notmuch@notmuchmail.org>;\r
+       Mon,  4 Aug 2014 18:45:29 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
+       [18.7.68.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id B383C431FAE\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Aug 2014 18:45:29 -0700 (PDT)\r
+X-AuditID: 12074422-f79be6d000007518-2d-53e03739b80f\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-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 79.4B.29976.93730E35; Mon,  4 Aug 2014 21:45:29 -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 s751jR37014355; \r
+       Mon, 4 Aug 2014 21:45:27 -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 s751jPS7005239\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Mon, 4 Aug 2014 21:45:26 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1XETob-0004bB-7w; Mon, 04 Aug 2014 21:45:25 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 2/2] emacs: Expand default saved searches and add shortcut\r
+       keys\r
+Date: Mon,  4 Aug 2014 21:45:21 -0400\r
+Message-Id: <1407203121-17640-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 2.0.0\r
+In-Reply-To: <1407203121-17640-1-git-send-email-amdragon@mit.edu>\r
+References: <20140805014403.GX13893@mit.edu>\r
+       <1407203121-17640-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFrrIIsWRmVeSWpSXmKPExsUixCmqrWtp/iDY4ONOTosbrd2MFvvubGGy\r
+       WD2Xx+L6zZnMDiweu57/ZfLYOesuu8ezVbeYPbYces8cwBLFZZOSmpNZllqkb5fAlbF22VrG\r
+       gu1CFTsW3mZqYLzO28XIySEhYCKxaO9CZghbTOLCvfVsXYxcHEICs5kkelt2s0I4GxglTq1u\r
+       hsrcZpK4sPkxM4Qzl1Hi8eTVTCD9bAIaEtv2L2cEsUUEpCV23p3NCmIzC2RJbHh5EGyHsECQ\r
+       xJSuN2BxFgFViUX/L4D18go4SJztX8UCcYecRMONT2wgNqeAo8S6y5vA4kICyRL3Li1im8DI\r
+       v4CRYRWjbEpulW5uYmZOcWqybnFyYl5eapGuqV5uZoleakrpJkZQyLG7KO1g/HlQ6RCjAAej\r
+       Eg+vgNr9YCHWxLLiytxDjJIcTEqivKF6D4KF+JLyUyozEosz4otKc1KLDzFKcDArifDmCwLl\r
+       eFMSK6tSi/JhUtIcLErivG+trYKFBNITS1KzU1MLUotgsjIcHEoSvD9NgRoFi1LTUyvSMnNK\r
+       ENJMHJwgw3mAhjubgQwvLkjMLc5Mh8ifYlSUEufNBGkWAElklObB9cJSwitGcaBXhHkvgFTx\r
+       ANMJXPcroMFMQIPNdO6DDC5JREhJNTD6NyZ908h9ts10pjn/0TkCz3MXMDLmTHtk8mf2CtfY\r
+       r7sWeD1wWsoVp3T8n2268sm9L2+87pM5a1pyjv9U6r5Di7PXpV35+fGAYfWy1eX78/mFizh+\r
+       vPy00aNq6zbxnDdzk6fNVG44dI6/gXmTU7fKwejJ826d0GRLX3P/sZcV25HNvxtW8Cq9V2Ip\r
+       zkg01GIuKk4EAElZXFDkAgAA\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, 05 Aug 2014 01:45:35 -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