19/dd49c47dfb18bcbd9d730ad517e5d345268175

   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 496D4431FB6\r
   6         for <notmuch@notmuchmail.org>; Fri,  9 Nov 2012 09:53:59 -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 sRoVq347VHsI for <notmuch@notmuchmail.org>;\r
  16         Fri,  9 Nov 2012 09:53:57 -0800 (PST)\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 365DB431FAE\r
  20         for <notmuch@notmuchmail.org>; Fri,  9 Nov 2012 09:53:57 -0800 (PST)\r
  21 X-AuditID: 12074425-b7fcc6d00000091f-26-509d433464d7\r
  22 Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 64.10.02335.4334D905; Fri,  9 Nov 2012 12:53:56 -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 qA9HrtPv031420; \r
  27         Fri, 9 Nov 2012 12:53:56 -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 qA9Hrsnk012538\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Fri, 9 Nov 2012 12:53:55 -0500 (EST)\r
  34 Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1TWsmA-0005wZ-0h; Fri, 09 Nov 2012 12:53:54 -0500\r
  37 Date: Fri, 9 Nov 2012 12:53:53 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: Mark Walters <markwalters1009@gmail.com>\r
  40 Subject: Re: [PATCH] contrib: pick: bugfix when trying to show a non-message\r
  41 Message-ID: <20121109175353.GI22284@mit.edu>\r
  42 References: <1351797983-19707-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: <1351797983-19707-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+NgFupjleLIzCtJLcpLzFFi42IRYrdT0TVxnhtgsOaopsXquTwW12/OZHZg\r
  50         8tg56y67x7NVt5gDmKK4bFJSczLLUov07RK4Mk4cnsJUcIujovnPL7YGxlb2LkZODgkBE4m9\r
  51         s2+xQdhiEhfurQeyuTiEBPYxSiz80MAC4axnlHjf2MgO4ZxgkjjbNQPKWcIo8e7kIqAeDg4W\r
  52         ARWJJc2iIKPYBDQktu1fzghiiwjoSNw+tABsHbOAtMS3381MILawgI/Eg40TmUFsXqCa3puT\r
  53         WEBsIQFPie+zF7FCxAUlTs58wgLRqyVx499LJpBVIHOW/+MACXMKeEn0P10A9oEo0AVTTm5j\r
  54         m8AoNAtJ9ywk3bMQuhcwMq9ilE3JrdLNTczMKU5N1i1OTszLSy3StdDLzSzRS00p3cQIDmoX\r
  55         1R2MEw4pHWIU4GBU4uHd8Wh2gBBrYllxZe4hRkkOJiVR3vWOcwOE+JLyUyozEosz4otKc1KL\r
  56         DzFKcDArifBOZgLK8aYkVlalFuXDpKQ5WJTEeW+k3PQXEkhPLEnNTk0tSC2CycpwcChJ8Bo4\r
  57         ATUKFqWmp1akZeaUIKSZODhBhvMADbcEqeEtLkjMLc5Mh8ifYtTlOPpm7kNGIZa8/LxUKXFe\r
  58         XZAiAZCijNI8uDmwZPSKURzoLWFeIZAqHmAig5v0CmgJE9CSxiNzQJaUJCKkpBoY19VYz7G3\r
  59         dHXcePjnrbPWDH+9+d4lHtX2/avwlsV91zXt2uVmXMpOdy+sOH46smYD3/QIT+tcZvfsiYUb\r
  60         LXmPMtWzemvGmytGGzb82euUEXr7a8uihXwqTHW9dyt41Terba78o5fvfvvW5ZP3vgq6vK/M\r
  61         nh9+9PV9q6tTl/OEtHK01D2uzV2kxFKckWioxVxUnAgArzUMZyEDAAA=\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: Fri, 09 Nov 2012 17:53:59 -0000\r
  76 \r
  77 Quoth Mark Walters on Nov 01 at  7:26 pm:\r
  78 > If the user pressed return on the end result status line it gave a\r
  79 > blank message. Modify the function notmuch-pick-get-message-id to\r
  80 > return nil rather than an empty message-id in this case to fix this.\r
  81 > ---\r
  82 >  contrib/notmuch-pick/notmuch-pick.el |    4 +++-\r
  83 >  1 files changed, 3 insertions(+), 1 deletions(-)\r
  84 > \r
  85 > diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
  86 > index 15ac5e8..1886469 100644\r
  87 > --- a/contrib/notmuch-pick/notmuch-pick.el\r
  88 > +++ b/contrib/notmuch-pick/notmuch-pick.el\r
  89 > @@ -241,7 +241,9 @@ Some useful entries are:\r
  90 >  \r
  91 >  (defun notmuch-pick-get-message-id ()\r
  92 >    "Return the message id of the current message."\r
  93 > -  (concat "id:\"" (notmuch-pick-get-prop :id) "\""))\r
  94 > +  (let ((id (notmuch-pick-get-prop :id)))\r
  95 > +    (when id\r
  96 > +      (concat "id:\"" id "\""))))\r
  97 \r
  98 There's another bug here.  The ID query should be constructed with\r
  99 notmuch-id-to-query so it gets properly escaped.\r
 100 \r
 101 >  \r
 102 >  (defun notmuch-pick-get-match ()\r
 103 >    "Return whether the current message is a match."\r