diff options
author | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xssn.at> | 2011-07-24 12:07:51 +0200 |
commit | b8c33ee22e78f48f52bfde7328d20efe73493149 (patch) | |
tree | af5a3a56a5094facb1c00472c0b1a3be7478eca2 /vim/vim-7.2/7.2.261 | |
parent | 9c7f68c9ab1ed52a5c4c2cec57c71b15d2209f52 (diff) | |
parent | 34e8f8d7edc734b88753ff7cb0443f8489b02ee8 (diff) | |
download | aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.gz aur-packages-b8c33ee22e78f48f52bfde7328d20efe73493149.tar.xz |
Merge branch 'master' of git://git.server-speed.net/~flo/git/aur
Diffstat (limited to 'vim/vim-7.2/7.2.261')
-rw-r--r-- | vim/vim-7.2/7.2.261 | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/vim/vim-7.2/7.2.261 b/vim/vim-7.2/7.2.261 deleted file mode 100644 index 4f8e72d..0000000 --- a/vim/vim-7.2/7.2.261 +++ /dev/null @@ -1,83 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.261 -Fcc: outbox -From: Bram Moolenaar <Bram@moolenaar.net> -Mime-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit ------------- - -Patch 7.2.261 -Problem: When deleting lines with a specific folding configuration E38 may - appear. (Shahaf) -Solution: When adjusting nested folds for deleted lines take into account - that they don't start at the top of the enclosing fold. -Files: src/fold.c - - -*** ../vim-7.2.260/src/fold.c 2009-01-06 15:01:58.000000000 +0100 ---- src/fold.c 2009-09-18 14:43:23.000000000 +0200 -*************** -*** 1607,1617 **** - } - else - { -- /* 2, 3, or 5: need to correct nested folds too */ -- foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, -- line2 - fp->fd_top, amount, amount_after); - if (fp->fd_top < top) - { - if (last <= line2) - { - /* 2. fold contains line1, line2 is below fold */ ---- 1607,1617 ---- - } - else - { - if (fp->fd_top < top) - { -+ /* 2 or 3: need to correct nested folds too */ -+ foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, -+ line2 - fp->fd_top, amount, amount_after); - if (last <= line2) - { - /* 2. fold contains line1, line2 is below fold */ -*************** -*** 1628,1634 **** - } - else - { -! /* 5. fold is below line1 and contains line2 */ - if (amount == MAXLNUM) - { - fp->fd_len -= line2 - fp->fd_top + 1; ---- 1628,1638 ---- - } - else - { -! /* 5. fold is below line1 and contains line2; need to -! * correct nested folds too */ -! foldMarkAdjustRecurse(&fp->fd_nested, line1 - fp->fd_top, -! line2 - fp->fd_top, amount, -! amount_after + (fp->fd_top - top)); - if (amount == MAXLNUM) - { - fp->fd_len -= line2 - fp->fd_top + 1; -*** ../vim-7.2.260/src/version.c 2009-09-18 14:58:26.000000000 +0200 ---- src/version.c 2009-09-18 15:14:40.000000000 +0200 -*************** -*** 678,679 **** ---- 678,681 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 261, - /**/ - --- -Emacs is a nice OS - but it lacks a good text editor. -That's why I am using Vim. --Anonymous - - /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ -/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ -\\\ download, build and distribute -- http://www.A-A-P.org /// - \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |