5f/72991a383660726b960c3a09a3485ee093485a

   1 Return-Path: <jasonwoof@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 8943D431FB6\r
   6         for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:43 -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.699\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,\r
  13         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id N9oUtsqCFQpM for <notmuch@notmuchmail.org>;\r
  17         Sun, 10 Jul 2011 22:40:42 -0700 (PDT)\r
  18 Received: from mail-vw0-f53.google.com (mail-vw0-f53.google.com\r
  19         [209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 6EFBE429E29\r
  22         for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:39 -0700 (PDT)\r
  23 Received: by mail-vw0-f53.google.com with SMTP id 13so2781812vws.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 10 Jul 2011 22:40:39 -0700 (PDT)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
  26         h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to\r
  27         :references; bh=4ORxUKr95fZhq27SLRENn5ER8jrb8X5Ms/dBRCQHjHM=;\r
  28         b=Brqe4sC3FWk+wlXwKfQsN4zpX1OXuvolS4Zy6mtlAPcywY8Sx2M0Wso2I1/H4rDxXP\r
  29         BsaAWkpPxqfpdMfcSt9Hbigc7DW2WKy1SvFdbsBBCwR4M5uHKACzohQHC8iY3VctI5+u\r
  30         iRK7ySE3g0g/ZU1XW2XsW3iSbEIQiNdB97lXg=\r
  31 Received: by 10.52.155.173 with SMTP id vx13mr1925829vdb.411.1310362839202;\r
  32         Sun, 10 Jul 2011 22:40:39 -0700 (PDT)\r
  33 Received: from localhost.localdomain (c-98-216-100-90.hsd1.ma.comcast.net\r
  34         [98.216.100.90])\r
  35         by mx.google.com with ESMTPS id bl2sm5324172vbb.9.2011.07.10.22.40.38\r
  36         (version=SSLv3 cipher=OTHER); Sun, 10 Jul 2011 22:40:38 -0700 (PDT)\r
  37 Sender: Jason Woofenden <jasonwoof@gmail.com>\r
  38 From: Jason Woofenden <jason@jasonwoof.com>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 5/5] vim: fix citation/signature fold lengths\r
  41 Date: Mon, 11 Jul 2011 01:40:10 -0400\r
  42 Message-Id: <1310362810-10926-6-git-send-email-jason@jasonwoof.com>\r
  43 X-Mailer: git-send-email 1.7.5.4\r
  44 In-Reply-To: <1310362810-10926-1-git-send-email-jason@jasonwoof.com>\r
  45 References: <1310362810-10926-1-git-send-email-jason@jasonwoof.com>\r
  46 X-BeenThere: notmuch@notmuchmail.org\r
  47 X-Mailman-Version: 2.1.13\r
  48 Precedence: list\r
  49 List-Id: "Use and development of the notmuch mail system."\r
  50         <notmuch.notmuchmail.org>\r
  51 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  52         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  53 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  54 List-Post: <mailto:notmuch@notmuchmail.org>\r
  55 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  56 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  57         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  58 X-List-Received-Date: Mon, 11 Jul 2011 05:40:43 -0000\r
  59 \r
  60 Before they'd often miss the last line\r
  61 ---\r
  62  vim/plugin/notmuch.vim |   11 +++++++----\r
  63  1 files changed, 7 insertions(+), 4 deletions(-)\r
  64 \r
  65 diff --git a/vim/plugin/notmuch.vim b/vim/plugin/notmuch.vim\r
  66 index 2095547..12a0f88 100644\r
  67 --- a/vim/plugin/notmuch.vim\r
  68 +++ b/vim/plugin/notmuch.vim\r
  69 @@ -747,8 +747,11 @@ function! s:NM_cmd_show_parse(inlines)\r
  70                                  elseif mode_type == 'cit'\r
  71                                          if part_end || match(line, g:notmuch_show_citation_regexp) == -1\r
  72                                                  let outlnum = len(info['disp'])\r
  73 -                                                let foldinfo = [ mode_type, mode_start, outlnum-1, len(info['msgs']),\r
  74 -                                                               \ printf('[ %d-line citation.  Press "c" to show. ]', outlnum - mode_start) ]\r
  75 +                                                if !part_end\r
  76 +                                                        let outlnum = outlnum - 1\r
  77 +                                                endif\r
  78 +                                                let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),\r
  79 +                                                               \ printf('[ %d-line citation.  Press "c" to show. ]', 1 + outlnum - mode_start) ]\r
  80                                                  let mode_type = ''\r
  81                                          endif\r
  82                                  elseif mode_type == 'sig'\r
  83 @@ -756,8 +759,8 @@ function! s:NM_cmd_show_parse(inlines)\r
  84                                          if (outlnum - mode_start) > g:notmuch_show_signature_lines_max\r
  85                                                  let mode_type = ''\r
  86                                          elseif part_end\r
  87 -                                                let foldinfo = [ mode_type, mode_start, outlnum-1, len(info['msgs']),\r
  88 -                                                               \ printf('[ %d-line signature.  Press "i" to show. ]', outlnum - mode_start) ]\r
  89 +                                                let foldinfo = [ mode_type, mode_start, outlnum, len(info['msgs']),\r
  90 +                                                               \ printf('[ %d-line signature.  Press "i" to show. ]', 1 + outlnum - mode_start) ]\r
  91                                                  let mode_type = ''\r
  92                                          endif\r
  93                                  endif\r
  94 -- \r
  95 1.7.5.4\r
  96 \r