1 To: [email protected] |
|
2 Subject: Patch 7.2.281 |
|
3 Fcc: outbox |
|
4 From: Bram Moolenaar <[email protected]> |
|
5 Mime-Version: 1.0 |
|
6 Content-Type: text/plain; charset=UTF-8 |
|
7 Content-Transfer-Encoding: 8bit |
|
8 ------------ |
|
9 |
|
10 Patch 7.2.281 |
|
11 Problem: 'cursorcolumn' highlighting is wrong in diff mode. |
|
12 Solution: Adjust the column computation. (Lech Lorens) |
|
13 Files: src/screen.c |
|
14 |
|
15 |
|
16 *** ../vim-7.2.280/src/screen.c 2009-11-03 17:20:18.000000000 +0100 |
|
17 --- src/screen.c 2009-11-03 17:13:16.000000000 +0100 |
|
18 *************** |
|
19 *** 3008,3018 **** |
|
20 mb_ptr_adv(ptr); |
|
21 } |
|
22 |
|
23 ! #ifdef FEAT_VIRTUALEDIT |
|
24 ! /* When 'virtualedit' is set the end of the line may be before the |
|
25 ! * start of the displayed part. */ |
|
26 ! if (vcol < v && *ptr == NUL && virtual_active()) |
|
27 vcol = v; |
|
28 #endif |
|
29 |
|
30 /* Handle a character that's not completely on the screen: Put ptr at |
|
31 --- 3008,3040 ---- |
|
32 mb_ptr_adv(ptr); |
|
33 } |
|
34 |
|
35 ! #if defined(FEAT_SYN_HL) || defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) |
|
36 ! /* When: |
|
37 ! * - 'cuc' is set, or |
|
38 ! * - 'virtualedit' is set, or |
|
39 ! * - the visual mode is active, |
|
40 ! * the end of the line may be before the start of the displayed part. |
|
41 ! */ |
|
42 ! if (vcol < v && ( |
|
43 ! # ifdef FEAT_SYN_HL |
|
44 ! wp->w_p_cuc |
|
45 ! # if defined(FEAT_VIRTUALEDIT) || defined(FEAT_VISUAL) |
|
46 ! || |
|
47 ! # endif |
|
48 ! # endif |
|
49 ! # ifdef FEAT_VIRTUALEDIT |
|
50 ! virtual_active() |
|
51 ! # ifdef FEAT_VISUAL |
|
52 ! || |
|
53 ! # endif |
|
54 ! # endif |
|
55 ! # ifdef FEAT_VISUAL |
|
56 ! (VIsual_active && wp->w_buffer == curwin->w_buffer) |
|
57 ! # endif |
|
58 ! )) |
|
59 ! { |
|
60 vcol = v; |
|
61 + } |
|
62 #endif |
|
63 |
|
64 /* Handle a character that's not completely on the screen: Put ptr at |
|
65 *** ../vim-7.2.280/src/version.c 2009-11-03 17:20:18.000000000 +0100 |
|
66 --- src/version.c 2009-11-03 17:34:54.000000000 +0100 |
|
67 *************** |
|
68 *** 678,679 **** |
|
69 --- 678,681 ---- |
|
70 { /* Add new patch number below this line */ |
|
71 + /**/ |
|
72 + 281, |
|
73 /**/ |
|
74 |
|
75 -- |
|
76 Every person is responsible for the choices he makes. |
|
77 |
|
78 /// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\ |
|
79 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ |
|
80 \\\ download, build and distribute -- http://www.A-A-P.org /// |
|
81 \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |
|