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

patch 7.4.830

Browse Source 
Problem:    Resetting 'encoding' when doing ":set all&" causes problems.
            (Bjorn Linse) Display is not updated.
Solution:   Do not reset 'encoding'. Do a full redraw.
This commit is contained in:
Bram Moolenaar 2015-08-25 12:56:31 +02:00
parent 7fb7d34caf
commit b341dda575
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/option.c
View File

@ -3656,6 +3656,7 @@ set_option_default(opt_idx, opt_flags, compatible)
/* /*
* Set all options (except terminal options) to their default value. * Set all options (except terminal options) to their default value.
* When "opt_flags" is non-zero skip 'encoding'.
*/ */
static void static void
set_options_default(opt_flags) set_options_default(opt_flags)
@ -3668,7 +3669,8 @@ set_options_default(opt_flags)
#endif #endif
for (i = 0; !istermoption(&options[i]); i++) for (i = 0; !istermoption(&options[i]); i++)
if (!(options[i].flags & P_NODEFAULT)) if (!(options[i].flags & P_NODEFAULT)
&& (opt_flags == 0 || options[i].var != (char_u *)&p_enc))
set_option_default(i, opt_flags, p_cp); set_option_default(i, opt_flags, p_cp);
#ifdef FEAT_WINDOWS #ifdef FEAT_WINDOWS
@ -4204,6 +4206,7 @@ do_set(arg, opt_flags)
++arg; ++arg;
/* Only for :set command set global value of local options. */ /* Only for :set command set global value of local options. */
set_options_default(OPT_FREE | opt_flags); set_options_default(OPT_FREE | opt_flags);
redraw_all_later(CLEAR);
} }
else else
{ {

2
src/version.c
View File

@ -741,6 +741,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 */
/**/
830,
/**/ /**/
829, 829,
/**/ /**/