78/07a31aa4843d58d0ff6ae7a576f9e001142734

   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 EFA22431FC9\r
   6         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:57 -0800 (PST)\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 HSIMEeuTUFfF for <notmuch@notmuchmail.org>;\r
  16         Fri, 14 Dec 2012 21:15:56 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
  18         [18.9.25.12])\r
  19         by olra.theworths.org (Postfix) with ESMTP id AC912429E3D\r
  20         for <notmuch@notmuchmail.org>; Fri, 14 Dec 2012 21:15:37 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7f886d000000936-8c-50cc0779934b\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 93.02.02358.9770CC05; Sat, 15 Dec 2012 00:15:37 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id qBF5FQdH020493; \r
  27         Sat, 15 Dec 2012 00:15:26 -0500\r
  28 Received: from drake.dyndns.org\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBF5FOPB011444\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sat, 15 Dec 2012 00:15:25 -0500 (EST)\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1Tjk5s-0002kL-58; Sat, 15 Dec 2012 00:15:24 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 2/7] emacs: Use unified error handling in\r
  41         notmuch-call-notmuch-process\r
  42 Date: Sat, 15 Dec 2012 00:15:08 -0500\r
  43 Message-Id: <1355548513-10085-3-git-send-email-amdragon@mit.edu>\r
  44 X-Mailer: git-send-email 1.7.10.4\r
  45 In-Reply-To: <1355548513-10085-1-git-send-email-amdragon@mit.edu>\r
  46 References: <1355548513-10085-1-git-send-email-amdragon@mit.edu>\r
  47 X-Brightmail-Tracker:\r
  48  H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrlvJfibAoPmfkMXquTwW12/OZHZg\r
  49         8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mq6fWMZYsIyr4tf6KUwNjOs5uhg5OSQETCRW\r
  50         t6xlhbDFJC7cW8/WxcjFISSwj1HiwJqjUM4GRokthy9DOY+YJP7c/coO4cxllDi56itYP5uA\r
  51         hsS2/csZQWwRAWmJnXdng8WZBRwlPu9fxAZiCwuESdx69IcZxGYRUJV4/rkLLM4r4CAx5/k+\r
  52         qDsUJbqfTQCLcwL1Lvt4jgXEFgKqOfvqLusERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz8lKL\r
  53         dA31cjNL9FJTSjcxgkKJU5JnB+Obg0qHGAU4GJV4eHdEnA4QYk0sK67MPcQoycGkJMp7i+FM\r
  54         gBBfUn5KZUZicUZ8UWlOavEhRgkOZiURXrEtQOW8KYmVValF+TApaQ4WJXHeyyk3/YUE0hNL\r
  55         UrNTUwtSi2CyMhwcShK8P9iAhgoWpaanVqRl5pQgpJk4OEGG8wANB6vhLS5IzC3OTIfIn2JU\r
  56         lBLnvQqSEABJZJTmwfXCYv0VozjQK8K80SBVPMA0Adf9CmgwE9DguEvHQQaXJCKkpBoY9S5I\r
  57         NWwof/r5w9Ud8lo/X4c9exvk7bb9e5fnf44jDNGhK49XL/e1/nAhuGWl/jnWnb9OTrnhOjfv\r
  58         WITpu7wfxVvepDwX/qFstUHvVf8mfqmX/5cxqJ+JPHsrcP36tMeRet4tXYuyD61YlffR7/L8\r
  59         G9Er7nZcXZQnmcT74+dpjuU5Ykdt/jz52qfEUpyRaKjFXFScCABdaiRT0AIAAA==\r
  60 X-BeenThere: notmuch@notmuchmail.org\r
  61 X-Mailman-Version: 2.1.13\r
  62 Precedence: list\r
  63 List-Id: "Use and development of the notmuch mail system."\r
  64         <notmuch.notmuchmail.org>\r
  65 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  66         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  67 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  68 List-Post: <mailto:notmuch@notmuchmail.org>\r
  69 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  70 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  71         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  72 X-List-Received-Date: Sat, 15 Dec 2012 05:15:58 -0000\r
  73 \r
  74 This makes notmuch-call-notmuch-process use the unified CLI error\r
  75 handling, which basically refines the error handling this function\r
  76 already did.\r
  77 ---\r
  78  emacs/notmuch.el |   15 ++++-----------\r
  79  1 file changed, 4 insertions(+), 11 deletions(-)\r
  80 \r
  81 diff --git a/emacs/notmuch.el b/emacs/notmuch.el\r
  82 index f9454d8..e25b54e 100644\r
  83 --- a/emacs/notmuch.el\r
  84 +++ b/emacs/notmuch.el\r
  85 @@ -538,17 +538,10 @@ If BARE is set then do not prefix with \"thread:\""\r
  86  \r
  87  Output from the process will be presented to the user as an error\r
  88  and will also appear in a buffer named \"*Notmuch errors*\"."\r
  89 -  (let ((error-buffer (get-buffer-create "*Notmuch errors*")))\r
  90 -    (with-current-buffer error-buffer\r
  91 -       (erase-buffer))\r
  92 -    (if (eq (apply 'call-process notmuch-command nil error-buffer nil args) 0)\r
  93 -       (point)\r
  94 -      (progn\r
  95 -       (with-current-buffer error-buffer\r
  96 -         (let ((beg (point-min))\r
  97 -               (end (- (point-max) 1)))\r
  98 -           (error (buffer-substring beg end))\r
  99 -           ))))))\r
 100 +  (with-temp-buffer\r
 101 +    (let ((status (apply #'call-process notmuch-command nil t nil args)))\r
 102 +      (notmuch-check-exit-status status (cons notmuch-command args)\r
 103 +                                (buffer-string)))))\r
 104  \r
 105  (defun notmuch-search-set-tags (tags &optional pos)\r
 106    (let ((new-result (plist-put (notmuch-search-get-result pos) :tags tags)))\r
 107 -- \r
 108 1.7.10.4\r
 109 \r