]>
Commit | Line | Data |
---|---|---|
ad28a8ff AG |
1 | To: vim-dev@vim.org |
2 | Subject: patch 7.1.009 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.009 | |
11 | Problem: In diff mode, displaying the difference between a tab and spaces | |
12 | is not highlighted correctly. | |
13 | Solution: Only change highlighting at the end of displaying a tab. | |
14 | Files: src/screen.c | |
15 | ||
16 | ||
17 | *** ../vim-7.1.008/src/screen.c Thu May 10 20:15:31 2007 | |
18 | --- src/screen.c Mon Jun 11 21:49:44 2007 | |
19 | *************** | |
20 | *** 3459,3467 **** | |
21 | #ifdef FEAT_DIFF | |
22 | if (diff_hlf != (hlf_T)0) | |
23 | { | |
24 | ! if (diff_hlf == HLF_CHD && ptr - line >= change_start) | |
25 | diff_hlf = HLF_TXD; /* changed text */ | |
26 | ! if (diff_hlf == HLF_TXD && ptr - line > change_end) | |
27 | diff_hlf = HLF_CHD; /* changed line */ | |
28 | line_attr = hl_attr(diff_hlf); | |
29 | } | |
30 | --- 3459,3469 ---- | |
31 | #ifdef FEAT_DIFF | |
32 | if (diff_hlf != (hlf_T)0) | |
33 | { | |
34 | ! if (diff_hlf == HLF_CHD && ptr - line >= change_start | |
35 | ! && n_extra == 0) | |
36 | diff_hlf = HLF_TXD; /* changed text */ | |
37 | ! if (diff_hlf == HLF_TXD && ptr - line > change_end | |
38 | ! && n_extra == 0) | |
39 | diff_hlf = HLF_CHD; /* changed line */ | |
40 | line_attr = hl_attr(diff_hlf); | |
41 | } | |
42 | *** ../vim-7.1.008/src/version.c Tue Jun 19 17:33:52 2007 | |
43 | --- src/version.c Tue Jun 19 17:36:36 2007 | |
44 | *************** | |
45 | *** 668,669 **** | |
46 | --- 668,671 ---- | |
47 | { /* Add new patch number below this line */ | |
48 | + /**/ | |
49 | + 9, | |
50 | /**/ | |
51 | ||
52 | -- | |
53 | Linux is just like a wigwam: no Windows, no Gates and an Apache inside. | |
54 | ||
55 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
56 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
57 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
58 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |