5f/b21d3857ff10c63be792e0cb6b15699ea92e73

   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 D18F6431FB6\r
   6         for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 17:34:06 -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 heKTOQphOUnA for <notmuch@notmuchmail.org>;\r
  16         Sun,  2 Dec 2012 17:34:06 -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 E1BD4431FAE\r
  20         for <notmuch@notmuchmail.org>; Sun,  2 Dec 2012 17:34:05 -0800 (PST)\r
  21 X-AuditID: 1209190c-b7f886d000000936-36-50bc018c9af6\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 5B.A6.02358.C810CB05; Sun,  2 Dec 2012 20:34:04 -0500 (EST)\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 qB31Y4pK016383; \r
  27         Sun, 2 Dec 2012 20:34:04 -0500\r
  28 Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\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 qB31Y2cC015358\r
  32         (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT);\r
  33         Sun, 2 Dec 2012 20:34:03 -0500 (EST)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TfKv4-0006dd-EH; Sun, 02 Dec 2012 20:34:02 -0500\r
  37 Date: Sun, 2 Dec 2012 20:34:02 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Mark Walters <markwalters1009@gmail.com>\r
  40 Subject: Re: [PATCH] emacs: stash bugfix\r
  41 Message-ID: <20121203013402.GC1020@mit.edu>\r
  42 References: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
  43 MIME-Version: 1.0\r
  44 Content-Type: text/plain; charset=us-ascii\r
  45 Content-Disposition: inline\r
  46 In-Reply-To: <1354443068-5030-1-git-send-email-markwalters1009@gmail.com>\r
  47 User-Agent: Mutt/1.5.21 (2010-09-15)\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFmpileLIzCtJLcpLzFFi42IRYrdT0e1h3BNgsHSDtcXquTwW12/OZHZg\r
  50         8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mt5P3s9U8ICjYvauRSwNjK/Zuhg5OSQETCTa\r
  51         tp5hh7DFJC7cWw8U5+IQEtjHKLFn4lQWCGc9o8StB39ZIZwLTBILJ2+GyixhlPg8+yCQw8HB\r
  52         IqAisbNRCWQUm4CGxLb9yxlBbBEBHYnbhxaArWAWkJb49ruZCcQWBqo5fukG2Bm8AtoSU7es\r
  53         BosLCXhIdG05wA4RF5Q4OfMJC0SvlsSNfy+ZQFaBzFn+jwMkzCngKXHnXBtYqyjQBVNObmOb\r
  54         wCg0C0n3LCTdsxC6FzAyr2KUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFLTSndxAgKak5J\r
  55         nh2Mbw4qHWIU4GBU4uF98GV3gBBrYllxZe4hRkkOJiVRXrP/QCG+pPyUyozE4oz4otKc1OJD\r
  56         jBIczEoivIsrgHK8KYmVValF+TApaQ4WJXHeyyk3/YUE0hNLUrNTUwtSi2CyMhwcShK8eQx7\r
  57         AoQEi1LTUyvSMnNKENJMHJwgw3mAhrMCk4AQb3FBYm5xZjpE/hSjopQ470yQZgGQREZpHlwv\r
  58         LOm8YhQHekWYdy9IFQ8wYcF1vwIazAQ0+IUQyNXFJYkIKakGRr2Cs/N6Q39FSHy1Wylxye3j\r
  59         X910zj8vXHRT1+6TNmPfq5J8jcfw0OfIGULbypY+bi1sEHj1Sypt54u65Dti9vU2vHHh+mtT\r
  60         Na5KFa3yMD16RjEkXT1v96esd1UfV87f9Vs35+CaqJp5jPxOR+sb7Sdnzc++GtMyK6Anzc6C\r
  61         2TLw1wHHvZdXKrEUZyQaajEXFScCAOUkencVAwAA\r
  62 Cc: notmuch@notmuchmail.org\r
  63 X-BeenThere: notmuch@notmuchmail.org\r
  64 X-Mailman-Version: 2.1.13\r
  65 Precedence: list\r
  66 List-Id: "Use and development of the notmuch mail system."\r
  67         <notmuch.notmuchmail.org>\r
  68 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  70 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  71 List-Post: <mailto:notmuch@notmuchmail.org>\r
  72 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  73 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  74         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  75 X-List-Received-Date: Mon, 03 Dec 2012 01:34:07 -0000\r
  76 \r
  77 Quoth Mark Walters on Dec 02 at 10:11 am:\r
  78 > Currently an attempt to stash a non-existent field (eg cc when not\r
  79 > present) throws an error. Catch this case and give the user a warning\r
  80 > message.\r
  81 > \r
  82 > ---\r
  83 > While messing around with notmuch-pick key bindings I found the\r
  84 > following bug. The easiest way I have found to trigger it is cc\r
  85 > (stash-cc) in show mode on a message with no cc header.\r
  86 > \r
  87 > Best wishes\r
  88 > \r
  89 > Mark\r
  90 > \r
  91 >  emacs/notmuch-lib.el |    7 +++++--\r
  92 >  1 files changed, 5 insertions(+), 2 deletions(-)\r
  93 > \r
  94 > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
  95 > index 1d0ec17..c7d8e02 100644\r
  96 > --- a/emacs/notmuch-lib.el\r
  97 > +++ b/emacs/notmuch-lib.el\r
  98 > @@ -183,8 +183,11 @@ user-friendly queries."\r
  99 >  \r
 100 >  (defun notmuch-common-do-stash (text)\r
 101 >    "Common function to stash text in kill ring, and display in minibuffer."\r
 102 > -  (kill-new text)\r
 103 > -  (message "Stashed: %s" text))\r
 104 > +  (if text\r
 105 > +      (progn\r
 106 > +     (kill-new text)\r
 107 > +     (message "Stashed: %s" text))\r
 108 > +    (message "Warning: Nothing to stash!")))\r
 109 \r
 110 Without the unnecessary "Warning:" bit of the message, LGTM.\r