f2/fdb049b5c8ecb67010863e9b2893c15e352177

   1 Return-Path: <markwalters1009@gmail.com>\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 89355431FD0\r
   6         for <notmuch@notmuchmail.org>; Thu,  4 Jul 2013 00:10:04 -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.201\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
  14         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  15 Received: from olra.theworths.org ([127.0.0.1])\r
  16         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  17         with ESMTP id gY8Z1DjpBuZZ for <notmuch@notmuchmail.org>;\r
  18         Thu,  4 Jul 2013 00:09:57 -0700 (PDT)\r
  19 Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com\r
  20         [209.85.215.182]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  21         (No client certificate requested)\r
  22         by olra.theworths.org (Postfix) with ESMTPS id C8E15431FBF\r
  23         for <notmuch@notmuchmail.org>; Thu,  4 Jul 2013 00:09:56 -0700 (PDT)\r
  24 Received: by mail-ea0-f182.google.com with SMTP id d10so557410eaj.41\r
  25         for <notmuch@notmuchmail.org>; Thu, 04 Jul 2013 00:09:54 -0700 (PDT)\r
  26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
  27         h=from:to:cc:subject:date:message-id:x-mailer;\r
  28         bh=dXpQCSuZGKGrOz0BYCMjHvHc5g3noH6Bcw9Ft2CCRMA=;\r
  29         b=zfaTVa8EU2HII4ZIbubL91HV6nPHWfDTCdtWMi/LrG7FgcwcWUoQSay63AYXiup7sZ\r
  30         2vFAcfWY1Xf+c6x1hMRNG17oC6pLh03VU5Hhy3oM8SKg5PJ75G7aBCsEA5d7+L3NPki/\r
  31         D9pZr0IEMGunun1Ry6BIaVES8f27B9nd3w+2irPlvP8pPmCFdDaC14fUaUkPAO6iftlk\r
  32         LV+jzcS+RVndWwAKJbOw8tobGfgDufFp4EipqXPD4qCTuxq4ji731EP1ocXb3pXFUxSD\r
  33         gQWcX83ZN2WQidizr4mmgNiX9KRtFSx36cVEs0rPYJkfE8pggLEE/EEcWY/mxclZkq38\r
  34         ryew==\r
  35 X-Received: by 10.14.149.141 with SMTP id x13mr4956634eej.77.1372921792797;\r
  36         Thu, 04 Jul 2013 00:09:52 -0700 (PDT)\r
  37 Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
  38         by mx.google.com with ESMTPSA id p49sm3036046eeu.2.2013.07.04.00.09.51\r
  39         for <multiple recipients>\r
  40         (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
  41         Thu, 04 Jul 2013 00:09:52 -0700 (PDT)\r
  42 From: Mark Walters <markwalters1009@gmail.com>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH] contrib: pick: use notmuch-start-notmuch\r
  45 Date: Thu,  4 Jul 2013 08:09:48 +0100\r
  46 Message-Id: <1372921788-16042-1-git-send-email-markwalters1009@gmail.com>\r
  47 X-Mailer: git-send-email 1.7.9.1\r
  48 X-BeenThere: notmuch@notmuchmail.org\r
  49 X-Mailman-Version: 2.1.13\r
  50 Precedence: list\r
  51 List-Id: "Use and development of the notmuch mail system."\r
  52         <notmuch.notmuchmail.org>\r
  53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  54         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  56 List-Post: <mailto:notmuch@notmuchmail.org>\r
  57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  59         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  60 X-List-Received-Date: Thu, 04 Jul 2013 07:10:04 -0000\r
  61 \r
  62 This uses the new notmuch-start-notmuch function which should give\r
  63 better handling of stderr and errors generally.\r
  64 ---\r
  65 \r
  66 Hi\r
  67 \r
  68 This converts pick to Austin's new async error handling code (see\r
  69 commit 08fde50bf3a4c54f6413aff4052e0d84392463f9). That code separates\r
  70 stderr from stdout and makes sure that appropriate messages are\r
  71 displayed to the user.\r
  72 \r
  73 I think this is simple enough and beneficial enough to go in for 0.16\r
  74 (so I will tag it 0.16). Of course it only affects notmuch-pick so\r
  75 is relatively safe.\r
  76 \r
  77 Best wishes\r
  78 \r
  79 Mark\r
  80 \r
  81 \r
  82  contrib/notmuch-pick/notmuch-pick.el |    7 +++----\r
  83  1 files changed, 3 insertions(+), 4 deletions(-)\r
  84 \r
  85 diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
  86 index fbd7c0b..7f5f729 100644\r
  87 --- a/contrib/notmuch-pick/notmuch-pick.el\r
  88 +++ b/contrib/notmuch-pick/notmuch-pick.el\r
  89 @@ -817,16 +817,15 @@ Complete list of currently available key bindings:\r
  90      (if (equal (car (process-lines notmuch-command "count" search-args)) "0")\r
  91         (setq search-args basic-query))\r
  92      (if notmuch-pick-asynchronous-parser\r
  93 -       (let ((proc (start-process\r
  94 -                    "notmuch-pick" buffer\r
  95 -                    notmuch-command "show" "--body=false" "--format=sexp"\r
  96 +       (let ((proc (notmuch-start-notmuch\r
  97 +                    "notmuch-pick" buffer #'notmuch-pick-process-sentinel\r
  98 +                    "show" "--body=false" "--format=sexp"\r
  99                      message-arg search-args))\r
 100               ;; Use a scratch buffer to accumulate partial output.\r
 101                ;; This buffer will be killed by the sentinel, which\r
 102                ;; should be called no matter how the process dies.\r
 103                (parse-buf (generate-new-buffer " *notmuch pick parse*")))\r
 104            (process-put proc 'parse-buf parse-buf)\r
 105 -         (set-process-sentinel proc 'notmuch-pick-process-sentinel)\r
 106           (set-process-filter proc 'notmuch-pick-process-filter)\r
 107           (set-process-query-on-exit-flag proc nil))\r
 108        (progn\r
 109 -- \r
 110 1.7.9.1\r
 111 \r