updated for version 7.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)

diff --git a/src/option.c b/src/option.c
index f76b0f9ee4eae70f99b4628a387baed637189187..b8e49d8b130273bd2b2654ea60691b5634847d61 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -4566,6 +4566,31 @@ do_set(arg, opt_flags)
                                save_arg = arg;
                                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.

diff --git a/src/version.c b/src/version.c
index a72be66eef794cbb2e1327c2eb9c17ef6effb065..d3ff17077e637df1bc681dfe397093b3061b0279 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    354,
 /**/
     353,
 /**/