projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 01d03c47 AG |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.0.036 | |
| 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.0.036 | |
| 11 | Problem: Can't compile with small features and syntax highlighting or the | |
| 12 | diff feature. | |
| 13 | Solution: Define LINE_ATTR whenever syntax highlighting or the diff feature | |
| 14 | is enabled. | |
| 15 | Files: src/screen.c | |
| 16 | ||
| 17 | ||
| 18 | *** ../vim-7.0.035/src/screen.c Fri May 5 23:13:04 2006 | |
| 19 | --- src/screen.c Tue Jul 11 21:33:53 2006 | |
| 20 | *************** | |
| 21 | *** 2612,2618 **** | |
| 22 | #ifdef FEAT_LINEBREAK | |
| 23 | int need_showbreak = FALSE; | |
| 24 | #endif | |
| 25 | ! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) | |
| 26 | # define LINE_ATTR | |
| 27 | int line_attr = 0; /* atrribute for the whole line */ | |
| 28 | #endif | |
| 29 | --- 2612,2619 ---- | |
| 30 | #ifdef FEAT_LINEBREAK | |
| 31 | int need_showbreak = FALSE; | |
| 32 | #endif | |
| 33 | ! #if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ | |
| 34 | ! || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) | |
| 35 | # define LINE_ATTR | |
| 36 | int line_attr = 0; /* atrribute for the whole line */ | |
| 37 | #endif | |
| 38 | *************** | |
| 39 | *** 2626,2632 **** | |
| 40 | int prev_c = 0; /* previous Arabic character */ | |
| 41 | int prev_c1 = 0; /* first composing char for prev_c */ | |
| 42 | #endif | |
| 43 | ! #if defined(FEAT_DIFF) || defined(LINE_ATTR) | |
| 44 | int did_line_attr = 0; | |
| 45 | #endif | |
| 46 | ||
| 47 | --- 2627,2633 ---- | |
| 48 | int prev_c = 0; /* previous Arabic character */ | |
| 49 | int prev_c1 = 0; /* first composing char for prev_c */ | |
| 50 | #endif | |
| 51 | ! #if defined(LINE_ATTR) | |
| 52 | int did_line_attr = 0; | |
| 53 | #endif | |
| 54 | ||
| 55 | *************** | |
| 56 | *** 4116,4132 **** | |
| 57 | --ptr; /* put it back at the NUL */ | |
| 58 | } | |
| 59 | #endif | |
| 60 | ! #if defined(FEAT_DIFF) || defined(LINE_ATTR) | |
| 61 | else if (( | |
| 62 | # ifdef FEAT_DIFF | |
| 63 | ! diff_hlf != (hlf_T)0 | |
| 64 | ! # ifdef LINE_ATTR | |
| 65 | ! || | |
| 66 | ! # endif | |
| 67 | # endif | |
| 68 | - # ifdef LINE_ATTR | |
| 69 | line_attr != 0 | |
| 70 | - # endif | |
| 71 | ) && ( | |
| 72 | # ifdef FEAT_RIGHTLEFT | |
| 73 | wp->w_p_rl ? (col >= 0) : | |
| 74 | --- 4117,4128 ---- | |
| 75 | --ptr; /* put it back at the NUL */ | |
| 76 | } | |
| 77 | #endif | |
| 78 | ! #if defined(LINE_ATTR) | |
| 79 | else if (( | |
| 80 | # ifdef FEAT_DIFF | |
| 81 | ! diff_hlf != (hlf_T)0 || | |
| 82 | # endif | |
| 83 | line_attr != 0 | |
| 84 | ) && ( | |
| 85 | # ifdef FEAT_RIGHTLEFT | |
| 86 | wp->w_p_rl ? (col >= 0) : | |
| 87 | *************** | |
| 88 | *** 4237,4243 **** | |
| 89 | * At end of the text line or just after the last character. | |
| 90 | */ | |
| 91 | if (c == NUL | |
| 92 | ! #if defined(FEAT_DIFF) || defined(LINE_ATTR) | |
| 93 | || did_line_attr == 1 | |
| 94 | #endif | |
| 95 | ) | |
| 96 | --- 4233,4239 ---- | |
| 97 | * At end of the text line or just after the last character. | |
| 98 | */ | |
| 99 | if (c == NUL | |
| 100 | ! #if defined(LINE_ATTR) | |
| 101 | || did_line_attr == 1 | |
| 102 | #endif | |
| 103 | ) | |
| 104 | *************** | |
| 105 | *** 4258,4264 **** | |
| 106 | || prevcol == (long)match_hl[0].startcol | |
| 107 | || prevcol == (long)match_hl[1].startcol | |
| 108 | || prevcol == (long)match_hl[2].startcol) | |
| 109 | ! # if defined(FEAT_DIFF) || defined(LINE_ATTR) | |
| 110 | && did_line_attr <= 1 | |
| 111 | # endif | |
| 112 | ) | |
| 113 | --- 4254,4260 ---- | |
| 114 | || prevcol == (long)match_hl[0].startcol | |
| 115 | || prevcol == (long)match_hl[1].startcol | |
| 116 | || prevcol == (long)match_hl[2].startcol) | |
| 117 | ! # if defined(LINE_ATTR) | |
| 118 | && did_line_attr <= 1 | |
| 119 | # endif | |
| 120 | ) | |
| 121 | *** ../vim-7.0.035/src/version.c Fri Jun 23 21:36:49 2006 | |
| 122 | --- src/version.c Tue Jul 11 21:36:50 2006 | |
| 123 | *************** | |
| 124 | *** 668,669 **** | |
| 125 | --- 668,671 ---- | |
| 126 | { /* Add new patch number below this line */ | |
| 127 | + /**/ | |
| 128 | + 36, | |
| 129 | /**/ | |
| 130 | ||
| 131 | -- | |
| 132 | Every engineer dreams about saving the universe and having sex with aliens. | |
| 133 | This is much more glamorous than the real life of an engineer, which consists | |
| 134 | of hiding from the universe and having sex without the participation of other | |
| 135 | life forms. (Scott Adams - The Dilbert principle) | |
| 136 | ||
| 137 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 138 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 139 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 140 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |