ca/e5d03a5547e32bc4267b9edc2fc643a89d1622

   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 1055A431FD2\r
   6         for <notmuch@notmuchmail.org>; Thu,  5 Jul 2012 13:52:46 -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 U3FugbHiEpfr for <notmuch@notmuchmail.org>;\r
  16         Thu,  5 Jul 2012 13:52:45 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
  18         [18.9.25.14])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 75B7E431FC2\r
  20         for <notmuch@notmuchmail.org>; Thu,  5 Jul 2012 13:52:43 -0700 (PDT)\r
  21 X-AuditID: 1209190e-b7fb56d0000008b2-3b-4ff5fe9b6692\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id CB.2A.02226.B9EF5FF4; Thu,  5 Jul 2012 16:52:43 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q65KqgQN026897; \r
  27         Thu, 5 Jul 2012 16:52:42 -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.6/8.12.4) with ESMTP id q65KqbOZ027236\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Thu, 5 Jul 2012 16:52:40 -0400 (EDT)\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1Smt2T-0004XZ-I6; Thu, 05 Jul 2012 16:52:37 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH v2 3/9] emacs: Helper for reporting search parsing errors\r
  40 Date: Thu,  5 Jul 2012 16:52:21 -0400\r
  41 Message-Id: <1341521547-15502-4-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.10\r
  43 In-Reply-To: <1341521547-15502-1-git-send-email-amdragon@mit.edu>\r
  44 References: <1341354059-29396-1-git-send-email-amdragon@mit.edu>\r
  45         <1341521547-15502-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFjrOIsWRmVeSWpSXmKPExsUixG6nojv731d/gy1XhCxWz+WxuH5zJrPF\r
  48         m5XzWB2YPXbOusvucfjrQhaPZ6tuMQcwR3HZpKTmZJalFunbJXBlTHx+hrlgJk/Fv2WLmBsY\r
  49         33B2MXJySAiYSOzftYAVwhaTuHBvPVsXIxeHkMA+Rok1y7czQzjrGSUeXDsJlTnJJPF/2WUW\r
  50         CGcuo8T6hy/YQPrZBDQktu1fzghiiwhIS+y8OxtsLrNAnMSWKf/B4sICnhJrnyxjBrFZBFQl\r
  51         nu/6AWbzCjhITH33jxniDnmJp/f7wGZyCjhKXJi4GKxXSKBc4s+SfywTGPkXMDKsYpRNya3S\r
  52         zU3MzClOTdYtTk7My0st0jXWy80s0UtNKd3ECAovTkm+HYxfDyodYhTgYFTi4TXO/eIvxJpY\r
  53         VlyZe4hRkoNJSZS38fdXfyG+pPyUyozE4oz4otKc1OJDjBIczEoivL0ZQDnelMTKqtSifJiU\r
  54         NAeLkjjvlZSb/kIC6YklqdmpqQWpRTBZGQ4OJQnelX+BGgWLUtNTK9Iyc0oQ0kwcnCDDeYCG\r
  55         rwWp4S0uSMwtzkyHyJ9iVJQS550JkhAASWSU5sH1wuL/FaM40CvCvJ9AqniAqQOu+xXQYCag\r
  56         wXmLP4EMLklESEk1MM4zuXVx+n7vx55CKVufn1561HG723uH6Qfu5H/3YY1fkPyzOHHPASXZ\r
  57         Y6xn3l58pSUlVftVYrWv3UzPVLOKTKFcX9PpAsdddKsqdi78sV/wde9d3x7vLwvzszqf/rLe\r
  58         FOZWyNtZzOArkCpRbsDL7l//deoMPf6s6fcb7POj/p+9/Mim+uG560osxRmJhlrMRcWJAHBQ\r
  59         DMLaAgAA\r
  60 Cc: tomi.ollila@iki.fi\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Thu, 05 Jul 2012 20:52:46 -0000\r
  74 \r
  75 This removes the last bit of direct output from the parsing function.\r
  76 With the parser now responsible solely for parsing, we can swap it out\r
  77 for another parser.\r
  78 ---\r
  79  emacs/notmuch.el |    8 +++++++-\r
  80  1 file changed, 7 insertions(+), 1 deletion(-)\r
  81 \r
  82 diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
  83 index 746d0cb..f952fa8 100644\r
  84 --- a/emacs/notmuch.el\r
  85 +++ b/emacs/notmuch.el\r
  86 @@ -741,6 +741,11 @@ non-authors is found, assume that all of the authors match."\r
  87        (put-text-property beg (point) 'notmuch-search-authors authors)\r
  88        (put-text-property beg (point) 'notmuch-search-subject subject))))\r
  89  \r
  90 +(defun notmuch-search-show-error (string &rest objects)\r
  91 +  (insert "Error: Unexpected output from notmuch search:\n")\r
  92 +  (insert (apply #'format string objects))\r
  93 +  (insert "\n"))\r
  94 +\r
  95  (defun notmuch-search-process-filter (proc string)\r
  96    "Process and filter the output of \"notmuch search\""\r
  97    (let ((buffer (process-buffer proc))\r
  98 @@ -766,7 +771,8 @@ non-authors is found, assume that all of the authors match."\r
  99                            (tag-list (if tags (save-match-data (split-string tags)))))\r
 100                       (goto-char (point-max))\r
 101                       (if (/= (match-beginning 1) line)\r
 102 -                         (insert (concat "Error: Unexpected output from notmuch search:\n" (substring string line (match-beginning 1)) "\n")))\r
 103 +                         (notmuch-search-show-error\r
 104 +                          (substring string line (match-beginning 1))))\r
 105                       (when (string= thread-id notmuch-search-target-thread)\r
 106                         (set 'found-target (point))\r
 107                         (set 'notmuch-search-target-thread "found"))\r
 108 -- \r
 109 1.7.10\r
 110 \r