99/16761b8af7edc9d6ffca6761188c1b61e76648

   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 1B30F431FC2\r
   6         for <notmuch@notmuchmail.org>; Sat,  8 Jun 2013 21:45:59 -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 4he4WgEc1uFB for <notmuch@notmuchmail.org>;\r
  16         Sat,  8 Jun 2013 21:45:51 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (dmz-mailsec-scanner-8.mit.edu\r
  18         [18.7.68.37])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 8C7F5431FB6\r
  20         for <notmuch@notmuchmail.org>; Sat,  8 Jun 2013 21:45:51 -0700 (PDT)\r
  21 X-AuditID: 12074425-b7f966d00000454c-ca-51b4087fc6e3\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C8.4E.17740.F7804B15; Sun,  9 Jun 2013 00:45:51 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id r594jnNb004329; \r
  27         Sun, 9 Jun 2013 00:45:49 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [216.15.114.40]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r594jl8i009510\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Sun, 9 Jun 2013 00:45:48 -0400\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1UlXVj-0003wT-IS; Sun, 09 Jun 2013 00:45:47 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 1/2] emacs: Don't report CLI signals sent by Emacs as errors\r
  41 Date: Sun,  9 Jun 2013 00:45:37 -0400\r
  42 Message-Id: <1370753138-15021-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.10.4\r
  44 In-Reply-To: <1370753138-15021-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1370753138-15021-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrFIsWRmVeSWpSXmKPExsUixCmqrVvPsSXQ4HOTlMWefV4W12/OZHZg\r
  48         8rh7msvj2apbzAFMUVw2Kak5mWWpRfp2CVwZJx+vYC7YyF2x4ds1tgbGJs4uRk4OCQETiT9v\r
  49         WtghbDGJC/fWs3UxcnEICexjlHiy6wM7hLOBUeLNo8uMEM5tJomvN09AZeYyStxZdoYNpJ9N\r
  50         QENi2/7ljCC2iIC0xM67s1m7GDk4mAWcJNravEDCwgI+EgevvwMrYRFQlbgz5yCYzSvgIHFr\r
  51         ywQ2iDMUJbqfQdicAo4Sbd+fMIOMEQKq6e9yn8DIv4CRYRWjbEpulW5uYmZOcWqybnFyYl5e\r
  52         apGuhV5uZoleakrpJkZQELG7qO5gnHBI6RCjAAejEg+vwLrNgUKsiWXFlbmHGCU5mJREeVcw\r
  53         bAkU4kvKT6nMSCzOiC8qzUktPsQowcGsJMJ76TxQOW9KYmVValE+TEqag0VJnPdGyk1/IYH0\r
  54         xJLU7NTUgtQimKwMB4eSBG8jO9BQwaLU9NSKtMycEoQ0EwcnyHAeoOGnQGp4iwsSc4sz0yHy\r
  55         pxgVpcR5i0ASAiCJjNI8uF5YlL9iFAd6RZh3MkgVDzBBwHW/AhrMBDR4+qsNIINLEhFSUg2M\r
  56         1ltEs9hF2ln8X5x4zhLer55tpCJ+88DHOEluQ30FrYfr+qacuXj//6eIyCSjsxv/LSmdGxA2\r
  57         a8LPvWr3bgoss1xtc7jWvKGAX//lwsOZVfKKHRK9p2dUC/KHxtfwzLXt3+TWdvP/jg/v/+67\r
  58         WNq7ImVi4ZUNwnM9picdWuo6WXGig39Wjfg7JZbijERDLeai4kQAR1L1BM0CAAA=\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Sun, 09 Jun 2013 04:45:59 -0000\r
  72 \r
  73 Previously, when the user killed the search buffer before the CLI\r
  74 search process had completed, we would report the signal sent by Emacs\r
  75 to kill the CLI to the user as an error.  Fix this by only reporting\r
  76 error exits if the process buffer is still live.  We still report\r
  77 stderr output regardless in case stderr output was relevant to why the\r
  78 user killed the search buffer (such as a wrapper script being stuck).\r
  79 ---\r
  80  emacs/notmuch-lib.el |    8 ++++++--\r
  81  1 file changed, 6 insertions(+), 2 deletions(-)\r
  82 \r
  83 diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
  84 index 28f78e0..534f217 100644\r
  85 --- a/emacs/notmuch-lib.el\r
  86 +++ b/emacs/notmuch-lib.el\r
  87 @@ -528,8 +528,12 @@ status."\r
  88           (when sub-sentinel\r
  89             (funcall sub-sentinel proc event))\r
  90           ;; Check the exit status.  This will signal an error if the\r
  91 -         ;; exit status is non-zero.\r
  92 -         (notmuch-check-async-exit-status proc event real-command err-file)\r
  93 +         ;; exit status is non-zero.  Don't do this if the process\r
  94 +         ;; buffer is dead since that means Emacs killed the process\r
  95 +         ;; and there's no point in telling the user that (but we\r
  96 +         ;; still check for and report stderr output below).\r
  97 +         (when (buffer-live-p (process-buffer proc))\r
  98 +           (notmuch-check-async-exit-status proc event real-command err-file))\r
  99           ;; If that didn't signal an error, then any error output was\r
 100           ;; really warning output.  Show warnings, if any.\r
 101           (let ((warnings\r
 102 -- \r
 103 1.7.10.4\r
 104 \r