[PATCH v2 1/2] emacs: hello: bugfix: make alphabetically sorted saved searches work

diff --git a/f7/7551c8ff0d5e07d8b54f33c86a825473e633c2 b/f7/7551c8ff0d5e07d8b54f33c86a825473e633c2
new file mode 100644 (file)
index 0000000..549aa26
--- /dev/null
+++ b/f7/7551c8ff0d5e07d8b54f33c86a825473e633c2
@@ -0,0 +1,112 @@
+Return-Path: <markwalters1009@gmail.com>\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 CED80431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Apr 2014 05:46:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 RWiRCvMglkE7 for <notmuch@notmuchmail.org>;\r
+       Sat, 12 Apr 2014 05:46:35 -0700 (PDT)\r
+Received: from mail-we0-f175.google.com (mail-we0-f175.google.com\r
+       [74.125.82.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 29E2D431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Apr 2014 05:46:35 -0700 (PDT)\r
+Received: by mail-we0-f175.google.com with SMTP id q58so6384751wes.20\r
+       for <notmuch@notmuchmail.org>; Sat, 12 Apr 2014 05:46:32 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:in-reply-to:references;\r
+       bh=sxRiQvKJda8s9Z4WJiICJ3mLVGnRaMtSJpHFkjadIWM=;\r
+       b=jACjchaHibXqJESNuMBB/5sDafsLyZSQRgMjlxPEsNflkTFvHplMRk9F87DcZqLJL1\r
+       hfmjB8CvLI/0hOfXwU/ET3Xuv/NVaysiW/w0VXTTd0rtPjD/j6IMjqkfM4j9nielAG1k\r
+       UfqMJd9rVCaOIBrjTTCTyjx5IH4KO73mHujgZTKV4cLt6oSVWrT5aVpeJeQ6OmQEn8Qc\r
+       bfrnZLvwzHCCSh+ffktIyDSV6wuchAov7avtS7iqLB96ed3i1X31vxt53GVSH1no0Hy5\r
+       EnYRwS/fIWGenS4NiwQoUmOZkZR7WI72ChuO+oecjnwe8wX7t792resua5aGyhDUzLg5\r
+       8E9g==\r
+X-Received: by 10.180.188.134 with SMTP id ga6mr2352399wic.58.1397306792624;\r
+       Sat, 12 Apr 2014 05:46:32 -0700 (PDT)\r
+Received: from localhost (5751dfa2.skybroadband.com. [87.81.223.162])\r
+       by mx.google.com with ESMTPSA id\r
+       h19sm10434121wiw.17.2014.04.12.05.46.31 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 12 Apr 2014 05:46:31 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/2] emacs: hello: bugfix: make alphabetically sorted saved\r
+       searches work\r
+Date: Sat, 12 Apr 2014 13:46:26 +0100\r
+Message-Id: <1397306787-12207-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1397306787-12207-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1397306787-12207-1-git-send-email-markwalters1009@gmail.com>\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: Sat, 12 Apr 2014 12:46:41 -0000\r
+\r
+My recent changes to the saved search format broke the alphabetically\r
+sorted saved sort option. This makes it work again.\r
+\r
+Also update docs for saved-search sort defcustom to match the new\r
+format.\r
+\r
+Finally, since the saved-search list is no longer an alist change the\r
+names in the sort function to avoid confusion.\r
+---\r
+ emacs/notmuch-hello.el |   15 ++++++++++-----\r
+ 1 file changed, 10 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el\r
+index 4900a24..b8ec665 100644\r
+--- a/emacs/notmuch-hello.el\r
++++ b/emacs/notmuch-hello.el\r
+@@ -39,9 +39,12 @@ (defcustom notmuch-show-empty-saved-searches nil\r
+   :type 'boolean\r
+   :group 'notmuch-hello)\r
+ \r
+-(defun notmuch-sort-saved-searches (alist)\r
+-  "Generate an alphabetically sorted saved searches alist."\r
+-  (sort (copy-sequence alist) (lambda (a b) (string< (car a) (car b)))))\r
++(defun notmuch-sort-saved-searches (saved-searches)\r
++  "Generate an alphabetically sorted saved searches list."\r
++  (sort (copy-sequence saved-searches)\r
++      (lambda (a b)\r
++        (string< (notmuch-saved-search-get a :name)\r
++                 (notmuch-saved-search-get b :name)))))\r
+ \r
+ (defcustom notmuch-saved-search-sort-function nil\r
+   "Function used to sort the saved searches for the notmuch-hello view.\r
+@@ -51,8 +54,10 @@ (defcustom notmuch-saved-search-sort-function nil\r
+ stored in `notmuch-saved-searches'. Sort alphabetically sorts the\r
+ saved searches in alphabetical order. Custom sort function should\r
+ be a function or a lambda expression that takes the saved\r
+-searches alist as a parameter, and returns a new saved searches\r
+-alist to be used."\r
++searches list as a parameter, and returns a new saved searches\r
++list to be used. For compatibility with the various saved-search\r
++formats it should use notmuch-saved-search-get to access the\r
++fields of the search."\r
+   :type '(choice (const :tag "No sorting" nil)\r
+                (const :tag "Sort alphabetically" notmuch-sort-saved-searches)\r
+                (function :tag "Custom sort function"\r
+-- \r
+1.7.10.4\r
+\r