cf/24b9180ea3a8b0dd35909275087b0af1035575

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id E08CB431FC3\r
   6         for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 09:02:54 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id LnS9JdP8sPjC for <notmuch@notmuchmail.org>;\r
  16         Mon, 14 Jul 2014 09:02:49 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
  18         [18.9.25.12])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 68216431FC7\r
  22         for <notmuch@notmuchmail.org>; Mon, 14 Jul 2014 09:02:43 -0700 (PDT)\r
  23 X-AuditID: 1209190c-f79ef6d000005dd6-ca-53c3ff22a164\r
  24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id E3.47.24022.22FF3C35; Mon, 14 Jul 2014 12:02:42 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s6EG2eWW000842; \r
  31         Mon, 14 Jul 2014 12:02:40 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (static-155-212-141-65.mas.onecommunications.net [155.212.141.65])\r
  34         (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s6EG2Ntb026038\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Mon, 14 Jul 2014 12:02:39 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1X6ihr-0006rE-HE; Mon, 14 Jul 2014 12:02:23 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH 2/2] emacs: Expand default saved searches and add shortcut\r
  45  keys\r
  46 Date: Mon, 14 Jul 2014 12:02:15 -0400\r
  47 Message-Id: <1405353735-26244-3-git-send-email-amdragon@mit.edu>\r
  48 X-Mailer: git-send-email 2.0.0\r
  49 In-Reply-To: <1405353735-26244-1-git-send-email-amdragon@mit.edu>\r
  50 References: <1405353735-26244-1-git-send-email-amdragon@mit.edu>\r
  51 X-Brightmail-Tracker:\r
  52  H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsUixG6nrqv0/3Cwwd43BhY3WrsZLfbd2cJk\r
  53         sXouj8X1mzOZHVg8dj3/y+Sxc9Zddo9nq24xe2w59J45gCWKyyYlNSezLLVI3y6BK2PtsrWM\r
  54         BduFKnYsvM3UwHidt4uRk0NCwERiw8RvjBC2mMSFe+vZuhi5OIQEZjNJzPzwkQnC2cgosfvF\r
  55         O6jMDSaJb1/esoC0CAnMZZQ49sMQxGYT0JDYtn852CgRAWmJnXdns4LYzAJZEhteHmQGsYUF\r
  56         /CUuXX0K1ssioCpxau8EsDivgIPE8+5j7BBnyEk03PjEBmJzCjhKvHlxjBVil4PEpjWfmSYw\r
  57         8i9gZFjFKJuSW6Wbm5iZU5yarFucnJiXl1qka6iXm1mil5pSuokRFHCckjw7GN8cVDrEKMDB\r
  58         qMTDK/HucLAQa2JZcWXuIUZJDiYlUV6hX0AhvqT8lMqMxOKM+KLSnNTiQ4wSHMxKIrxHPwDl\r
  59         eFMSK6tSi/JhUtIcLErivG+trYKFBNITS1KzU1MLUotgsjIcHEoSvJv/AjUKFqWmp1akZeaU\r
  60         IKSZODhBhvMADb8CUsNbXJCYW5yZDpE/xagoJc7b9AcoIQCSyCjNg+uFJYRXjOJArwjzXgNp\r
  61         5wEmE7juV0CDmYAGl9eADS5JREhJNTAymexhze/8yhatd/LalUq1ZMEXLMed5niwqDzbqrvR\r
  62         Wo1rUrKJVW/5ld2drKaqKyu7HvmcbZO4mNB070n2g5ldT4Wm7OYSeXP4bAtDg1rX06eHNrav\r
  63         0xSe/uzK5RVcK9RmrUmr+TtXYGqCBz+jrdWE680LX11a4fIq54mu5fWlCy769vcecQhWYinO\r
  64         SDTUYi4qTgQAtaqJl+MCAAA=\r
  65 X-BeenThere: notmuch@notmuchmail.org\r
  66 X-Mailman-Version: 2.1.13\r
  67 Precedence: list\r
  68 List-Id: "Use and development of the notmuch mail system."\r
  69         <notmuch.notmuchmail.org>\r
  70 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  72 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  73 List-Post: <mailto:notmuch@notmuchmail.org>\r
  74 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  75 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  76         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  77 X-List-Received-Date: Mon, 14 Jul 2014 16:02:55 -0000\r
  78 \r
  79 This should help new users off to a better start with the addition of\r
  80 more sensible saved searches and default shortcut keys.  Most existing\r
  81 users have probably customized this variable and won't be affected.\r
  82 ---\r
  83  emacs/notmuch-hello.el                              | 9 +++++++--\r
  84  test/emacs.expected-output/notmuch-hello            | 2 +-\r
  85  test/emacs.expected-output/notmuch-hello-long-names | 2 +-\r
  86  3 files changed, 9 insertions(+), 4 deletions(-)\r
  87 \r
  88 diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
  89 index 061b27d..65d0627 100644\r
  90 --- a/emacs/notmuch-hello.el\r
  91 +++ b/emacs/notmuch-hello.el\r
  92 @@ -93,8 +93,13 @@ (define-widget 'notmuch-saved-search-plist 'list\r
  93                                     (const :tag "Oldest-first" oldest-first)\r
  94                                     (const :tag "Newest-first" newest-first))))))\r
  95  \r
  96 -(defcustom notmuch-saved-searches '((:name "inbox" :query "tag:inbox")\r
  97 -                                   (:name "unread" :query "tag:unread"))\r
  98 +(defcustom notmuch-saved-searches\r
  99 +  `((:name "inbox" :query "tag:inbox" :key ,(kbd "i"))\r
 100 +    (:name "unread" :query "tag:unread" :key ,(kbd "u"))\r
 101 +    (:name "flagged" :query "tag:flagged" :key ,(kbd "f"))\r
 102 +    (:name "sent" :query "tag:sent" :key ,(kbd "t"))\r
 103 +    (:name "drafts" :query "tag:draft" :key ,(kbd "d"))\r
 104 +    (:name "all mail" :query "*" :key ,(kbd "a")))\r
 105    "A list of saved searches to display.\r
 106  \r
 107  The saved search can be given in 3 forms. The preferred way is as\r
 108 diff --git a/test/emacs.expected-output/notmuch-hello b/test/emacs.expected-output/notmuch-hello\r
 109 index 2d69891..9ba4cfc 100644\r
 110 --- a/test/emacs.expected-output/notmuch-hello\r
 111 +++ b/test/emacs.expected-output/notmuch-hello\r
 112 @@ -2,7 +2,7 @@\r
 113  \r
 114  Saved searches: [edit]\r
 115  \r
 116 -         52 inbox           52 unread\r
 117 +         52 inbox           52 unread          52 all mail\r
 118  \r
 119  Search:                                                                     .\r
 120  \r
 121 diff --git a/test/emacs.expected-output/notmuch-hello-long-names b/test/emacs.expected-output/notmuch-hello-long-names\r
 122 index 486d0d9..1c8d6eb 100644\r
 123 --- a/test/emacs.expected-output/notmuch-hello-long-names\r
 124 +++ b/test/emacs.expected-output/notmuch-hello-long-names\r
 125 @@ -2,7 +2,7 @@\r
 126  \r
 127  Saved searches: [edit]\r
 128  \r
 129 -         52 inbox           52 unread\r
 130 +         52 inbox           52 unread          52 all mail\r
 131  \r
 132  Search:                                                                     .\r
 133  \r
 134 -- \r
 135 2.0.0\r
 136 \r