projects / packages / vim.git / blame
| Commit | Line | Data |
|---|---|---|
| 7fd9e930 ER |
1 | To: vim_dev@googlegroups.com |
| 2 | Subject: Patch 7.3.138 | |
| 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.3.138 | |
| 11 | Problem: ":com" changes the multi-byte text of :echo. (Dimitar Dimitrov) | |
| 12 | Solution: Search for K_SPECIAL as a byte, not a character. (Ben Schmidt) | |
| 13 | Files: src/ex_docmd.c | |
| 14 | ||
| 15 | ||
| 16 | *** ../vim-7.3.137/src/ex_docmd.c 2011-01-17 19:50:01.000000000 +0100 | |
| 17 | --- src/ex_docmd.c 2011-03-03 15:47:00.000000000 +0100 | |
| 18 | *************** | |
| 19 | *** 6054,6068 **** | |
| 20 | end = vim_strchr(start + 1, '>'); | |
| 21 | if (buf != NULL) | |
| 22 | { | |
| 23 | ! ksp = vim_strchr(p, K_SPECIAL); | |
| 24 | ! if (ksp != NULL && (start == NULL || ksp < start || end == NULL) | |
| 25 | && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER) | |
| 26 | # ifdef FEAT_GUI | |
| 27 | || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI) | |
| 28 | # endif | |
| 29 | )) | |
| 30 | { | |
| 31 | ! /* K_SPECIAL han been put in the buffer as K_SPECIAL | |
| 32 | * KS_SPECIAL KE_FILLER, like for mappings, but | |
| 33 | * do_cmdline() doesn't handle that, so convert it back. | |
| 34 | * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */ | |
| 35 | --- 6054,6070 ---- | |
| 36 | end = vim_strchr(start + 1, '>'); | |
| 37 | if (buf != NULL) | |
| 38 | { | |
| 39 | ! for (ksp = p; *ksp != NUL && *ksp != K_SPECIAL; ++ksp) | |
| 40 | ! ; | |
| 41 | ! if (*ksp == K_SPECIAL | |
| 42 | ! && (start == NULL || ksp < start || end == NULL) | |
| 43 | && ((ksp[1] == KS_SPECIAL && ksp[2] == KE_FILLER) | |
| 44 | # ifdef FEAT_GUI | |
| 45 | || (ksp[1] == KS_EXTRA && ksp[2] == (int)KE_CSI) | |
| 46 | # endif | |
| 47 | )) | |
| 48 | { | |
| 49 | ! /* K_SPECIAL has been put in the buffer as K_SPECIAL | |
| 50 | * KS_SPECIAL KE_FILLER, like for mappings, but | |
| 51 | * do_cmdline() doesn't handle that, so convert it back. | |
| 52 | * Also change K_SPECIAL KS_EXTRA KE_CSI into CSI. */ | |
| 53 | *** ../vim-7.3.137/src/version.c 2011-03-03 15:04:01.000000000 +0100 | |
| 54 | --- src/version.c 2011-03-03 15:53:41.000000000 +0100 | |
| 55 | *************** | |
| 56 | *** 716,717 **** | |
| 57 | --- 716,719 ---- | |
| 58 | { /* Add new patch number below this line */ | |
| 59 | + /**/ | |
| 60 | + 138, | |
| 61 | /**/ | |
| 62 | ||
| 63 | -- | |
| 64 | f y cn rd ths thn y cn hv grt jb n cmptr prgrmmng | |
| 65 | ||
| 66 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
| 67 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
| 68 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
| 69 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |