projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 717fd8f6 AF |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 6.2.092 | |
| 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 6.2.092 | |
| 11 | Problem: Invalid items appear in the help file tags. (Antonio Colombo) | |
| 12 | Solution: Only accept tags with white space before the first "*". | |
| 13 | Files: runtime/doc/doctags.c, src/ex_cmds.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-6.2.091/runtime/doc/doctags.c Sun Aug 1 14:01:25 1999 | |
| 17 | --- runtime/doc/doctags.c Fri Sep 5 21:31:23 2003 | |
| 18 | *************** | |
| 19 | *** 51,61 **** | |
| 20 | break; | |
| 21 | /* | |
| 22 | * Only accept a *tag* when it consists of valid | |
| 23 | ! * characters and is followed by a white character or | |
| 24 | ! * end-of-line. | |
| 25 | */ | |
| 26 | ! if (p == p2 && (p1 == line || p1[-1] != '-') && | |
| 27 | ! (strchr(" \t\n\r", p[1]) != NULL || p[1] == '\0')) | |
| 28 | { | |
| 29 | *p2 = '\0'; | |
| 30 | ++p1; | |
| 31 | --- 51,63 ---- | |
| 32 | break; | |
| 33 | /* | |
| 34 | * Only accept a *tag* when it consists of valid | |
| 35 | ! * characters, there is white space before it and is | |
| 36 | ! * followed by a white character or end-of-line. | |
| 37 | */ | |
| 38 | ! if (p == p2 | |
| 39 | ! && (p1 == line || p1[-1] == ' ' || p1[-1] == '\t') | |
| 40 | ! && (strchr(" \t\n\r", p[1]) != NULL | |
| 41 | ! || p[1] == '\0')) | |
| 42 | { | |
| 43 | *p2 = '\0'; | |
| 44 | ++p1; | |
| 45 | *** ../vim-6.2.091/src/ex_cmds.c Thu Sep 11 21:36:02 2003 | |
| 46 | --- src/ex_cmds.c Tue Sep 9 22:03:12 2003 | |
| 47 | *************** | |
| 48 | *** 5122,5132 **** | |
| 49 | ||
| 50 | /* | |
| 51 | * Only accept a *tag* when it consists of valid | |
| 52 | ! * characters, there is no '-' before it and is followed | |
| 53 | ! * by a white character or end-of-line. | |
| 54 | */ | |
| 55 | if (s == p2 | |
| 56 | ! && (p1 == IObuff || p1[-1] != '-') | |
| 57 | && (vim_strchr((char_u *)" \t\n\r", s[1]) != NULL | |
| 58 | || s[1] == '\0')) | |
| 59 | { | |
| 60 | --- 5122,5132 ---- | |
| 61 | ||
| 62 | /* | |
| 63 | * Only accept a *tag* when it consists of valid | |
| 64 | ! * characters, there is white space before it and is | |
| 65 | ! * followed by a white character or end-of-line. | |
| 66 | */ | |
| 67 | if (s == p2 | |
| 68 | ! && (p1 == IObuff || p1[-1] == ' ' || p1[-1] == '\t') | |
| 69 | && (vim_strchr((char_u *)" \t\n\r", s[1]) != NULL | |
| 70 | || s[1] == '\0')) | |
| 71 | { | |
| 72 | *** ../vim-6.2.091/src/version.c Fri Sep 12 19:56:26 2003 | |
| 73 | --- src/version.c Fri Sep 12 19:59:43 2003 | |
| 74 | *************** | |
| 75 | *** 632,633 **** | |
| 76 | --- 632,635 ---- | |
| 77 | { /* Add new patch number below this line */ | |
| 78 | + /**/ | |
| 79 | + 92, | |
| 80 | /**/ | |
| 81 | ||
| 82 | -- | |
| 83 | ARTHUR: CHARGE! | |
| 84 | [The mighty ARMY charges. Thundering noise of feet. Clatter of coconuts. | |
| 85 | Shouts etc. Suddenly there is a wail of a siren and a couple of police | |
| 86 | cars roar round in front of the charging ARMY and the POLICE leap out and | |
| 87 | stop them. TWO POLICEMAN and the HISTORIAN'S WIFE. Black Marias skid up | |
| 88 | behind them.] | |
| 89 | HISTORIAN'S WIFE: They're the ones, I'm sure. | |
| 90 | "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD | |
| 91 | ||
| 92 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 93 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
| 94 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
| 95 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |