Mercurial > vim
changeset 1081:0e57be57fa49 v7.0.207
updated for version 7.0-207
| author | vimboss |
|---|---|
| date | Sun, 04 Mar 2007 20:22:01 +0000 |
| parents | 313ec58cdc49 |
| children | 342d2b3a072a |
| files | src/getchar.c src/ops.c src/proto/getchar.pro src/version.c |
| diffstat | 4 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -4441,6 +4441,35 @@ vim_strsave_escape_csi(p) } /* + * Remove escaping from CSI and K_SPECIAL characters. Reverse of + * vim_strsave_escape_csi(). Works in-place. + */ + void +vim_unescape_csi(p) + char_u *p; +{ + char_u *s = p, *d = p; + + while (*s != NUL) + { + if (s[0] == K_SPECIAL && s[1] == KS_SPECIAL && s[2] == KE_FILLER) + { + *d++ = K_SPECIAL; + s += 3; + } + else if ((s[0] == K_SPECIAL || s[0] == CSI) + && s[1] == KS_EXTRA && s[2] == (int)KE_CSI) + { + *d++ = CSI; + s += 3; + } + else + *d++ = *s++; + } + *d = NUL; +} + +/* * Write map commands for the current mappings to an .exrc file. * Return FAIL on error, OK otherwise. */
--- a/src/ops.c +++ b/src/ops.c @@ -1042,6 +1042,9 @@ do_record(c) retval = FAIL; else { + /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */ + vim_unescape_csi(p); + /* * We don't want to change the default register here, so save and * restore the current register name.
--- a/src/proto/getchar.pro +++ b/src/proto/getchar.pro @@ -56,6 +56,7 @@ extern char_u *set_context_in_map_cmd __ extern int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file)); extern int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol)); extern char_u *vim_strsave_escape_csi __ARGS((char_u *p)); +extern void vim_unescape_csi __ARGS((char_u *p)); extern int makemap __ARGS((FILE *fd, buf_T *buf)); extern int put_escstr __ARGS((FILE *fd, char_u *strstart, int what)); extern void check_map_keycodes __ARGS((void));