a4/4ef398e6c3eff242741b2652066a9b50119f7e

   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 D8B7C431FC2\r
   6         for <notmuch@notmuchmail.org>; Fri, 17 May 2013 13:14:40 -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 hzT3CMlpdjBv for <notmuch@notmuchmail.org>;\r
  16         Fri, 17 May 2013 13:14:34 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-6.mit.edu (DMZ-MAILSEC-SCANNER-6.MIT.EDU\r
  18         [18.7.68.35])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 94E01431FC9\r
  20         for <notmuch@notmuchmail.org>; Fri, 17 May 2013 13:14:34 -0700 (PDT)\r
  21 X-AuditID: 12074423-b7f826d000001438-e1-51968faaeaa0\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-6.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C0.C2.05176.AAF86915; Fri, 17 May 2013 16:14:34 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH-1.MIT.EDU [18.9.28.11])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r4HKEUj2001563; \r
  27         Fri, 17 May 2013 16:14:31 -0400\r
  28 Received: from drake.dyndns.org (26-4-182.dynamic.csail.mit.edu [18.26.4.182])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r4HKETsI004817\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Fri, 17 May 2013 16:14:30 -0400\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1UdR2r-0006L5-Gq; Fri, 17 May 2013 16:14:29 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] emacs: Proper error string handling in search sentinel\r
  40 Date: Fri, 17 May 2013 16:14:28 -0400\r
  41 Message-Id: <1368821668-24316-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10.4\r
  43 X-Brightmail-Tracker:\r
  44  H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsUixG6nrruqf1qgQecLLovrN2cyOzB6PFt1\r
  45         izmAMYrLJiU1J7MstUjfLoEr4/M5/YIjbBV/V6xmbWD8xtLFyMkhIWAicf3SH2YIW0ziwr31\r
  46         bF2MXBxCAvsYJfadecAI4WxklHjx8hkjSJWQwBEmiRcPBCAScxklVq54xwSSYBPQkNi2fzlY\r
  47         kYiAtMTOu7NZuxg5OJgF1CT+dKmAhIUF3CUmbvzJCmKzCKhKzPq/Cmwzr4CDxPpfzWwQVyhK\r
  48         dD+bwDaBkXcBI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXTO93MwSvdSU0k2M4BBwUd7B+Oeg\r
  49         0iFGAQ5GJR7eD67TAoVYE8uKK3MPMUpyMCmJ8jp0A4X4kvJTKjMSizPii0pzUosPMUpwMCuJ\r
  50         8D4vBsrxpiRWVqUW5cOkpDlYlMR5r6Xc9BcSSE8sSc1OTS1ILYLJynBwKEnwCgJDXUiwKDU9\r
  51         tSItM6cEIc3EwQkynAdouGgfyPDigsTc4sx0iPwpRl2Ozecnv2MUYsnLz0uVEufVARkkAFKU\r
  52         UZoHNwcWu68YxYHeEuYVAKniAcY93KRXQEuYgJawXpsKsqQkESEl1cDoFTt7hf7PmJsTZi2c\r
  53         I5S2VHK/eOds2TlPH4qs2O338Ngnk7jrX/5+flz0z8Xk/XHHpfHqxn94o0TajgR/+t8/qW32\r
  54         /8ZbTw9Ovem33MrhhuW+yHsWakVXf9vwP1+evL5n7jzHiLKKs6KhkudWOc3XM+QS4plV1m/8\r
  55         I+pM5UmHWIUk7qq4zbtVlViKMxINtZiLihMBEuztZ7gCAAA=\r
  56 X-BeenThere: notmuch@notmuchmail.org\r
  57 X-Mailman-Version: 2.1.13\r
  58 Precedence: list\r
  59 List-Id: "Use and development of the notmuch mail system."\r
  60         <notmuch.notmuchmail.org>\r
  61 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  62         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  63 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  64 List-Post: <mailto:notmuch@notmuchmail.org>\r
  65 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  66 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  68 X-List-Received-Date: Fri, 17 May 2013 20:14:41 -0000\r
  69 \r
  70 Apparently Emacs provides a function to stringify errors properly.\r
  71 Use this in the search sentinel where we have to do our own error\r
  72 messaging, rather than assuming the first error argument will be the\r
  73 descriptive string.\r
  74 ---\r
  75  emacs/notmuch.el |    2 +-\r
  76  1 file changed, 1 insertion(+), 1 deletion(-)\r
  77 \r
  78 diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
  79 index e58c51d..4c1a6ca 100644\r
  80 --- a/emacs/notmuch.el\r
  81 +++ b/emacs/notmuch.el\r
  82 @@ -660,7 +660,7 @@ of the result."\r
  83                       ;; things happen if a sentinel signals.  Mimic\r
  84                       ;; the top-level's handling of error messages.\r
  85                       (error\r
  86 -                      (message "%s" (second err))\r
  87 +                      (message "%s" (error-message-string err))\r
  88                        (throw 'return nil)))\r
  89                     (if (and atbob\r
  90                              (not (string= notmuch-search-target-thread "found")))\r
  91 -- \r
  92 1.7.10.4\r
  93 \r