projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 907f7fb0 ER |
1 | To: vim-dev@vim.org |
| 2 | Subject: Patch 7.2.335 | |
| 3 | Fcc: outbox | |
| 4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
| 5 | Mime-Version: 1.0 | |
| 6 | Content-Type: text/plain; charset=UTF-8 | |
| 7 | Content-Transfer-Encoding: 8bit | |
| 8 | ------------ | |
| 9 | ||
| 10 | Patch 7.2.335 | |
| 11 | Problem: The CTRL-] command escapes too many characters. | |
| 12 | Solution: Use a different list of characters to be escaped. (Sergey Khorev) | |
| 13 | Files: src/normal.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.2.334/src/normal.c 2010-01-12 15:42:03.000000000 +0100 | |
| 17 | --- src/normal.c 2010-01-19 15:20:11.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 5406,5411 **** | |
| 20 | --- 5406,5412 ---- | |
| 21 | int n = 0; /* init for GCC */ | |
| 22 | int cmdchar; | |
| 23 | int g_cmd; /* "g" command */ | |
| 24 | + int tag_cmd = FALSE; | |
| 25 | char_u *aux_ptr; | |
| 26 | int isman; | |
| 27 | int isman_s; | |
| 28 | *************** | |
| 29 | *** 5515,5520 **** | |
| 30 | --- 5516,5522 ---- | |
| 31 | break; | |
| 32 | ||
| 33 | case ']': | |
| 34 | + tag_cmd = TRUE; | |
| 35 | #ifdef FEAT_CSCOPE | |
| 36 | if (p_cst) | |
| 37 | STRCPY(buf, "cstag "); | |
| 38 | *************** | |
| 39 | *** 5526,5535 **** | |
| 40 | default: | |
| 41 | if (curbuf->b_help) | |
| 42 | STRCPY(buf, "he! "); | |
| 43 | - else if (g_cmd) | |
| 44 | - STRCPY(buf, "tj "); | |
| 45 | else | |
| 46 | ! sprintf((char *)buf, "%ldta ", cap->count0); | |
| 47 | } | |
| 48 | ||
| 49 | /* | |
| 50 | --- 5528,5541 ---- | |
| 51 | default: | |
| 52 | if (curbuf->b_help) | |
| 53 | STRCPY(buf, "he! "); | |
| 54 | else | |
| 55 | ! { | |
| 56 | ! tag_cmd = TRUE; | |
| 57 | ! if (g_cmd) | |
| 58 | ! STRCPY(buf, "tj "); | |
| 59 | ! else | |
| 60 | ! sprintf((char *)buf, "%ldta ", cap->count0); | |
| 61 | ! } | |
| 62 | } | |
| 63 | ||
| 64 | /* | |
| 65 | *************** | |
| 66 | *** 5562,5569 **** | |
| 67 | aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); | |
| 68 | else if (cmdchar == '#') | |
| 69 | aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); | |
| 70 | ! else | |
| 71 | /* Don't escape spaces and Tabs in a tag with a backslash */ | |
| 72 | aux_ptr = (char_u *)"\\|\"\n*?["; | |
| 73 | ||
| 74 | p = buf + STRLEN(buf); | |
| 75 | --- 5568,5577 ---- | |
| 76 | aux_ptr = (char_u *)(p_magic ? "/.*~[^$\\" : "/^$\\"); | |
| 77 | else if (cmdchar == '#') | |
| 78 | aux_ptr = (char_u *)(p_magic ? "/?.*~[^$\\" : "/?^$\\"); | |
| 79 | ! else if (tag_cmd) | |
| 80 | /* Don't escape spaces and Tabs in a tag with a backslash */ | |
| 81 | + aux_ptr = (char_u *)"\\|\"\n["; | |
| 82 | + else | |
| 83 | aux_ptr = (char_u *)"\\|\"\n*?["; | |
| 84 | ||
| 85 | p = buf + STRLEN(buf); | |
| 86 | *** ../vim-7.2.334/src/version.c 2010-01-19 15:12:33.000000000 +0100 | |
| 87 | --- src/version.c 2010-01-19 15:22:44.000000000 +0100 | |
| 88 | *************** | |
| 89 | *** 683,684 **** | |
| 90 | --- 683,686 ---- | |
| 91 | { /* Add new patch number below this line */ | |
| 92 | + /**/ | |
| 93 | + 335, | |
| 94 | /**/ | |
| 95 | ||
| 96 | -- | |
| 97 | hundred-and-one symptoms of being an internet addict: | |
| 98 | 120. You ask a friend, "What's that big shiny thing?" He says, "It's the sun." | |
| 99 | ||
| 100 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 101 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 102 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
| 103 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |