aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.0-177

Browse Source
This commit is contained in:
Bram Moolenaar 2006-12-05 20:43:17 +00:00
parent 9c4b4ab3a6
commit cf8e7d14aa
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/getchar.c
View File

@ -76,7 +76,7 @@ static int maphash_valid = FALSE;
*/ */
static mapblock_T *first_abbr = NULL; /* first entry in abbrlist */ static mapblock_T *first_abbr = NULL; /* first entry in abbrlist */
static int KeyNoremap = FALSE; /* remapping disabled */ static int KeyNoremap = 0; /* remapping flags */
/* /*
* variables used by vgetorpeek() and flush_buffers() * variables used by vgetorpeek() and flush_buffers()
@ -1035,6 +1035,8 @@ ins_typebuf(str, noremap, offset, nottyped, silent)
/* /*
* Put character "c" back into the typeahead buffer. * Put character "c" back into the typeahead buffer.
* Can be used for a character obtained by vgetc() that needs to be put back. * Can be used for a character obtained by vgetc() that needs to be put back.
* Uses cmd_silent, KeyTyped and KeyNoremap to restore the flags belonging to
* the char.
*/ */
void void
ins_char_typebuf(c) ins_char_typebuf(c)
@ -1061,7 +1063,7 @@ ins_char_typebuf(c)
buf[1] = NUL; buf[1] = NUL;
#endif #endif
} }
(void)ins_typebuf(buf, REMAP_YES, 0, !KeyTyped, FALSE); (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent);
} }
/* /*
@ -2270,9 +2272,8 @@ vgetorpeek(advance)
gotchars(typebuf.tb_buf gotchars(typebuf.tb_buf
+ typebuf.tb_off, 1); + typebuf.tb_off, 1);
} }
KeyNoremap = (typebuf.tb_noremap[ KeyNoremap = typebuf.tb_noremap[
typebuf.tb_off] typebuf.tb_off];
& (RM_NONE|RM_SCRIPT));
del_typebuf(1, 0); del_typebuf(1, 0);
} }
break; /* got character, break for loop */ break; /* got character, break for loop */
@ -4196,7 +4197,8 @@ check_abbr(c, ptr, col, mincol)
if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */ if (typebuf.tb_no_abbr_cnt) /* abbrev. are not recursive */
return FALSE; return FALSE;
if (KeyNoremap) /* no remapping implies no abbreviation */ if ((KeyNoremap & (RM_NONE|RM_SCRIPT)) != 0)
/* no remapping implies no abbreviation */
return FALSE; return FALSE;
/* /*

5
src/normal.c
View File

@ -651,9 +651,8 @@ normal_cmd(oap, toplevel)
/* Fake a "c"hange command. When "restart_edit" is set (e.g., because /* Fake a "c"hange command. When "restart_edit" is set (e.g., because
* 'insertmode' is set) fake a "d"elete command, Insert mode will * 'insertmode' is set) fake a "d"elete command, Insert mode will
* restart automatically. * restart automatically.
* Insert the typed character in the typeahead buffer, so that it will * Insert the typed character in the typeahead buffer, so that it can
* be mapped in Insert mode. Required for ":lmap" to work. May cause * be mapped in Insert mode. Required for ":lmap" to work. */
* mapping a character from ":vnoremap"... */
ins_char_typebuf(c); ins_char_typebuf(c);
if (restart_edit != 0) if (restart_edit != 0)
c = 'd'; c = 'd';

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
177,
/**/ /**/
176, 176,
/**/ /**/