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 /gvim/vim-7.2/7.2.281 | |
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 'gvim/vim-7.2/7.2.281')
-rw-r--r-- | gvim/vim-7.2/7.2.281 | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/gvim/vim-7.2/7.2.281 b/gvim/vim-7.2/7.2.281 deleted file mode 100644 index f73d7a5..0000000 --- a/gvim/vim-7.2/7.2.281 +++ /dev/null @@ -1,81 +0,0 @@ -To: vim-dev@vim.org -Subject: Patch 7.2.281 -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.281 -Problem: 'cursorcolumn' highlighting is wrong in diff mode. -Solution: Adjust the column computation. (Lech Lorens) -Files: src/screen.c - - -*** ../vim-7.2.280/src/screen.c 2009-11-03 17:20:18.000000000 +0100 ---- src/screen.c 2009-11-03 17:13:16.000000000 +0100 -*************** -*** 3008,3018 **** - mb_ptr_adv(ptr); - } - -! #ifdef FEAT_VIRTUALEDIT -! /* When 'virtualedit' is set the end of the line may be before the -! * start of the displayed part. */ -! if (vcol < v && *ptr == NUL && virtual_active()) - vcol = v; - #endif - - /* Handle a character that's not completely on the screen: Put ptr at ---- 3008,3040 ---- - mb_ptr_adv(ptr); - } - -! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) -! /* When: -! * - 'cuc' is set, or -! * - 'virtualedit' is set, or -! * - the visual mode is active, -! * the end of the line may be before the start of the displayed part. -! */ -! if (vcol < v && ( -! # ifdef FEAT_SYN_HL -! wp->w_p_cuc -! # if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) -! || -! # endif -! # endif -! # ifdef FEAT_VIRTUALEDIT -! virtual_active() -! # ifdef FEAT_VISUAL -! || -! # endif -! # endif -! # ifdef FEAT_VISUAL -! (VIsual_active && wp->w_buffer == curwin->w_buffer) -! # endif -! )) -! { - vcol = v; -+ } - #endif - - /* Handle a character that's not completely on the screen: Put ptr at -*** ../vim-7.2.280/src/version.c 2009-11-03 17:20:18.000000000 +0100 ---- src/version.c 2009-11-03 17:34:54.000000000 +0100 -*************** -*** 678,679 **** ---- 678,681 ---- - { /* Add new patch number below this line */ -+ /**/ -+ 281, - /**/ - --- -Every person is responsible for the choices he makes. - - /// 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 /// |