diff options
author | Bram Moolenaar <Bram@vim.org> | 2011-11-30 11:15:47 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2011-11-30 11:15:47 +0100 |
commit | 4e5ccfa5c7183f8aed74f3c012816b9478a50263 (patch) | |
tree | 3859dca7190b472bdfb55ee9e595b919387dbb8f | |
parent | 1dff76bcb88e657556177e653f931129799a863e (diff) |
updated for version 7.3.354v7.3.354
Problem: ":set backspace+=eol" doesn't work when 'backspace' has a
backwards compatible value of 2.
Solution: Convert the number to a string. (Hirohito Higashi)
-rw-r--r-- | src/option.c | 25 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index f76b0f9ee4..b8e49d8b13 100644 --- a/src/option.c +++ b/src/option.c @@ -4567,6 +4567,31 @@ do_set(arg, opt_flags) arg = errbuf; } /* + * Convert 'backspace' number to string, for + * adding, prepending and removing string. + */ + else if (varp == (char_u *)&p_bs + && VIM_ISDIGIT(**(char_u **)varp)) + { + i = getdigits((char_u **)varp); + switch (i) + { + case 0: + *(char_u **)varp = empty_option; + break; + case 1: + *(char_u **)varp = vim_strsave( + (char_u *)"indent,eol"); + break; + case 2: + *(char_u **)varp = vim_strsave( + (char_u *)"indent,eol,start"); + break; + } + vim_free(oldval); + oldval = *(char_u **)varp; + } + /* * Convert 'whichwrap' number to string, for * backwards compatibility with Vim 3.0. * Misuse errbuf[] for the resulting string. diff --git a/src/version.c b/src/version.c index a72be66eef..d3ff17077e 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 354, +/**/ 353, /**/ 352, |