aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-04 21:33:48 -04:00
Code

updated for version 7.2-131

Browse Source
This commit is contained in:
Bram Moolenaar 2009-03-04 03:13:35 +00:00
parent 76243bd847
commit fab0623bcf
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/option.c
View File

@ -5797,14 +5797,28 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
/* load or unload key mapping tables */ /* load or unload key mapping tables */
errmsg = keymap_init(); errmsg = keymap_init();
/* When successfully installed a new keymap switch on using it. */ if (errmsg == NULL)
if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
{ {
curbuf->b_p_iminsert = B_IMODE_LMAP; if (*curbuf->b_p_keymap != NUL)
if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT) {
curbuf->b_p_imsearch = B_IMODE_LMAP; /* Installed a new keymap, switch on using it. */
set_iminsert_global(); curbuf->b_p_iminsert = B_IMODE_LMAP;
set_imsearch_global(); if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
curbuf->b_p_imsearch = B_IMODE_LMAP;
}
else
{
/* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
if (curbuf->b_p_iminsert == B_IMODE_LMAP)
curbuf->b_p_iminsert = B_IMODE_NONE;
if (curbuf->b_p_imsearch == B_IMODE_LMAP)
curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
}
if ((opt_flags & OPT_LOCAL) == 0)
{
set_iminsert_global();
set_imsearch_global();
}
# ifdef FEAT_WINDOWS # ifdef FEAT_WINDOWS
status_redraw_curbuf(); status_redraw_curbuf();
# endif # endif

2
src/version.c
View File

@ -676,6 +676,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 */
/**/
131,
/**/ /**/
130, 130,
/**/ /**/