Merge pull request #4204 from watiko/vim-7.4.915

vim-patch:7.4.{749,915}

5 files changed, 104 insertions, 85 deletions

diff --git a/scripts/genoptions.lua b/scripts/genoptions.lua
index 2859ca1795..da53d010bd 100644
--- a/scripts/genoptions.lua
+++ b/scripts/genoptions.lua
@@ -39,6 +39,7 @@ local redraw_flags={
 
 local list_flags={
   comma='P_COMMA',
+  onecomma='P_ONECOMMA',
   flags='P_FLAGLIST',
   flagscomma='P_COMMA|P_FLAGLIST',
 }
diff --git a/src/nvim/option.c b/src/nvim/option.c
index d3a2ce971d..c11e22703e 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -218,20 +218,22 @@ typedef struct vimoption {
 #define P_RALL          0x6000U  /* redraw all windows */
 #define P_RCLR          0x7000U  /* clear and redraw all */
 
-#define P_COMMA         0x8000U  /* comma separated list */
-#define P_NODUP         0x10000U /* don't allow duplicate strings */
-#define P_FLAGLIST      0x20000U /* list of single-char flags */
-
-#define P_SECURE        0x40000U /* cannot change in modeline or secure mode */
-#define P_GETTEXT       0x80000U /* expand default value with _() */
-#define P_NOGLOB       0x100000U /* do not use local value for global vimrc */
-#define P_NFNAME       0x200000U /* only normal file name chars allowed */
-#define P_INSECURE     0x400000U /* option was set from a modeline */
-#define P_PRI_MKRC     0x800000U /* priority for :mkvimrc (setting option has
-                                    side effects) */
-#define P_NO_ML       0x1000000U /* not allowed in modeline */
-#define P_CURSWANT    0x2000000U /* update curswant required; not needed when
-                                  * there is a redraw flag */
+#define P_COMMA         0x8000U    ///< comma separated list
+#define P_ONECOMMA      0x18000U   ///< P_COMMA and cannot have two consecutive
+                                   ///< commas
+#define P_NODUP         0x20000U   ///< don't allow duplicate strings
+#define P_FLAGLIST      0x40000U   ///< list of single-char flags
+
+#define P_SECURE        0x80000U   ///< cannot change in modeline or secure mode
+#define P_GETTEXT       0x100000U  ///< expand default value with _()
+#define P_NOGLOB        0x200000U  ///< do not use local value for global vimrc
+#define P_NFNAME        0x400000U  ///< only normal file name chars allowed
+#define P_INSECURE      0x800000U  ///< option was set from a modeline
+#define P_PRI_MKRC     0x1000000U  ///< priority for :mkvimrc (setting option
+                                   ///< has side effects)
+#define P_NO_ML        0x2000000U  ///< not allowed in modeline
+#define P_CURSWANT     0x4000000U  ///< update curswant required; not needed
+                                   ///< when there is a redraw flag
 
 #define HIGHLIGHT_INIT \
   "8:SpecialKey,~:EndOfBuffer,z:TermCursor,Z:TermCursorNC,@:NonText," \
@@ -1674,9 +1676,11 @@ do_set (
                 if (adding) {
                   i = (int)STRLEN(origval);
                   // Strip a trailing comma, would get 2.
-                  if (comma && i > 1 && origval[i - 1] == ','
+                  if (comma && i > 1
+                      && (flags & P_ONECOMMA) == P_ONECOMMA
+                      && origval[i - 1] == ','
                       && origval[i - 2] != '\\') {
-                    --i;
+                    i--;
                   }
                   memmove(newval + i + comma, newval,
                       STRLEN(newval) + 1);
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 3dd37cb5dc..df77c374ec 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -15,7 +15,7 @@
 --  }
 -- }
 -- types: bool, number, string
--- lists: (nil), comma, flags, flagscomma
+-- lists: (nil), comma, onecomma, flags, flagscomma
 -- scopes: global, buffer, window
 -- redraw options: statuslines, current_window, current_buffer, all_windows, 
 --                 everything, curswant
@@ -133,7 +133,7 @@ return {
     },
     {
       full_name='backspace', abbreviation='bs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       varname='p_bs',
@@ -149,7 +149,7 @@ return {
     },
     {
       full_name='backupcopy', abbreviation='bkc',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vim=true,
       varname='p_bkc',
@@ -161,7 +161,7 @@ return {
     },
     {
       full_name='backupdir', abbreviation='bdir',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       vi_def=true,
@@ -179,7 +179,7 @@ return {
     },
     {
       full_name='backupskip', abbreviation='bsk',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       vi_def=true,
       varname='p_bsk',
       defaults={if_true={vi=""}}
@@ -227,7 +227,7 @@ return {
     },
     {
       full_name='breakindentopt', abbreviation='briopt',
-      type='string', list='comma', scope={'window'},
+      type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -268,7 +268,7 @@ return {
     },
     {
       full_name='casemap', abbreviation='cmp',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_cmp',
@@ -307,7 +307,7 @@ return {
     },
     {
       full_name='cinkeys', abbreviation='cink',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -316,7 +316,7 @@ return {
     },
     {
       full_name='cinoptions', abbreviation='cino',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -325,7 +325,7 @@ return {
     },
     {
       full_name='cinwords', abbreviation='cinw',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -334,7 +334,7 @@ return {
     },
     {
       full_name='clipboard', abbreviation='cb',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_cb',
@@ -357,7 +357,7 @@ return {
     },
     {
       full_name='colorcolumn', abbreviation='cc',
-      type='string', list='comma', scope={'window'},
+      type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'current_window'},
@@ -375,7 +375,7 @@ return {
     },
     {
       full_name='comments', abbreviation='com',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -403,7 +403,7 @@ return {
     },
     {
       full_name='complete', abbreviation='cpt',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       alloced=true,
       varname='p_cpt',
@@ -435,7 +435,7 @@ return {
     },
     {
       full_name='completeopt', abbreviation='cot',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_cot',
@@ -483,7 +483,7 @@ return {
     },
     {
       full_name='cscopequickfix', abbreviation='csqf',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_csqf',
@@ -568,7 +568,7 @@ return {
     },
     {
       full_name='dictionary', abbreviation='dict',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
       expand=true,
@@ -594,7 +594,7 @@ return {
     },
     {
       full_name='diffopt', abbreviation='dip',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -612,7 +612,7 @@ return {
     },
     {
       full_name='directory', abbreviation='dir',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       vi_def=true,
@@ -622,7 +622,7 @@ return {
     },
     {
       full_name='display', abbreviation='dy',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       redraw={'all_windows'},
@@ -696,7 +696,7 @@ return {
     },
     {
       full_name='errorformat', abbreviation='efm',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_efm',
@@ -711,7 +711,7 @@ return {
     },
     {
       full_name='eventignore', abbreviation='ei',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_ei',
@@ -745,7 +745,7 @@ return {
     },
     {
       full_name='fileencodings', abbreviation='fencs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       vi_def=true,
       varname='p_fencs',
       defaults={if_true={vi="ucs-bom,utf-8,default,latin1"}}
@@ -762,7 +762,7 @@ return {
     },
     {
       full_name='fileformats', abbreviation='ffs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       varname='p_ffs',
@@ -791,7 +791,7 @@ return {
     },
     {
       full_name='fillchars', abbreviation='fcs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'all_windows'},
@@ -815,7 +815,7 @@ return {
     },
     {
       full_name='foldclose', abbreviation='fcl',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'current_window'},
@@ -871,7 +871,7 @@ return {
     },
     {
       full_name='foldmarker', abbreviation='fmr',
-      type='string', list='comma', scope={'window'},
+      type='string', list='onecomma', scope={'window'},
       deny_duplicates=true,
       vi_def=true,
       vim=true,
@@ -904,7 +904,7 @@ return {
     },
     {
       full_name='foldopen', abbreviation='fdo',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'curswant'},
@@ -972,7 +972,7 @@ return {
     },
     {
       full_name='grepformat', abbreviation='gfm',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_gefm',
@@ -995,7 +995,7 @@ return {
     },
     {
       full_name='guicursor', abbreviation='gcr',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_guicursor',
@@ -1003,7 +1003,7 @@ return {
     },
     {
       full_name='guifont', abbreviation='gfn',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'everything'},
@@ -1011,14 +1011,14 @@ return {
     },
     {
       full_name='guifontset', abbreviation='gfs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       vi_def=true,
       redraw={'everything'},
       enable_if=false,
     },
     {
       full_name='guifontwide', abbreviation='gfw',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'everything'},
@@ -1070,7 +1070,7 @@ return {
     },
     {
       full_name='helplang', abbreviation='hlg',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       vi_def=true,
       varname='p_hlg',
       defaults={if_true={vi=""}}
@@ -1084,7 +1084,7 @@ return {
     },
     {
       full_name='highlight', abbreviation='hl',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       redraw={'everything'},
@@ -1213,7 +1213,7 @@ return {
     },
     {
       full_name='indentkeys', abbreviation='indk',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -1297,7 +1297,7 @@ return {
     },
     {
       full_name='keymodel', abbreviation='km',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_km',
@@ -1316,7 +1316,7 @@ return {
     },
     {
       full_name='langmap', abbreviation='lmap',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       vi_def=true,
@@ -1385,7 +1385,7 @@ return {
     },
     {
       full_name='lispwords', abbreviation='lw',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_lispwords', pv_name='p_lw',
@@ -1400,7 +1400,7 @@ return {
     },
     {
       full_name='listchars', abbreviation='lcs',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       redraw={'all_windows'},
@@ -1441,7 +1441,7 @@ return {
     },
     {
       full_name='matchpairs', abbreviation='mps',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -1581,7 +1581,7 @@ return {
     },
     {
       full_name='mouseshape', abbreviation='mouses',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       enable_if=false,
@@ -1595,7 +1595,7 @@ return {
     },
     {
       full_name='nrformats', abbreviation='nf',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       alloced=true,
       varname='p_nf',
@@ -1762,7 +1762,7 @@ return {
     },
     {
       full_name='printoptions', abbreviation='popt',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_popt',
@@ -1877,7 +1877,7 @@ return {
     },
     {
       full_name='runtimepath', abbreviation='rtp',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       vi_def=true,
@@ -1919,7 +1919,7 @@ return {
     },
     {
       full_name='scrollopt', abbreviation='sbo',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_sbo',
@@ -1949,7 +1949,7 @@ return {
     },
     {
       full_name='selectmode', abbreviation='slm',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_slm',
@@ -1957,7 +1957,7 @@ return {
     },
     {
       full_name='sessionoptions', abbreviation='ssop',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       varname='p_ssop',
@@ -1968,7 +1968,7 @@ return {
     },
     {
       full_name='shada', abbreviation='sd',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       varname='p_shada',
@@ -2192,7 +2192,7 @@ return {
     },
     {
       full_name='spellfile', abbreviation='spf',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       secure=true,
       vi_def=true,
       alloced=true,
@@ -2202,7 +2202,7 @@ return {
     },
     {
       full_name='spelllang', abbreviation='spl',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       vi_def=true,
       alloced=true,
       expand=true,
@@ -2212,7 +2212,7 @@ return {
     },
     {
       full_name='spellsuggest', abbreviation='sps',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       secure=true,
       vi_def=true,
       expand=true,
@@ -2252,7 +2252,7 @@ return {
     },
     {
       full_name='suffixes', abbreviation='su',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_su',
@@ -2260,7 +2260,7 @@ return {
     },
     {
       full_name='suffixesadd', abbreviation='sua',
-      type='string', list='comma', scope={'buffer'},
+      type='string', list='onecomma', scope={'buffer'},
       deny_duplicates=true,
       vi_def=true,
       alloced=true,
@@ -2277,7 +2277,7 @@ return {
     },
     {
       full_name='switchbuf', abbreviation='swb',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_swb',
@@ -2347,7 +2347,7 @@ return {
     },
     {
       full_name='tags', abbreviation='tag',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
       expand=true,
@@ -2393,7 +2393,7 @@ return {
     },
     {
       full_name='thesaurus', abbreviation='tsr',
-      type='string', list='comma', scope={'global', 'buffer'},
+      type='string', list='onecomma', scope={'global', 'buffer'},
       deny_duplicates=true,
       vi_def=true,
       expand=true,
@@ -2478,7 +2478,7 @@ return {
     },
     {
       full_name='undodir', abbreviation='udir',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       vi_def=true,
@@ -2549,7 +2549,7 @@ return {
     },
     {
       full_name='viewoptions', abbreviation='vop',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_vop',
@@ -2557,7 +2557,7 @@ return {
     },
     {
       full_name='viminfo', abbreviation='vi',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       secure=true,
       varname='p_shada',
@@ -2565,7 +2565,7 @@ return {
     },
     {
       full_name='virtualedit', abbreviation='ve',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       vim=true,
@@ -2610,7 +2610,7 @@ return {
     },
     {
       full_name='wildignore', abbreviation='wig',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vi_def=true,
       varname='p_wig',
@@ -2632,7 +2632,7 @@ return {
     },
     {
       full_name='wildmode', abbreviation='wim',
-      type='string', list='comma', scope={'global'},
+      type='string', list='onecomma', scope={'global'},
       deny_duplicates=true,
       vim=true,
       varname='p_wim',
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 80877d61d0..a95e5f2adf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -373,7 +373,7 @@ static int included_patches[] = {
   // 918 NA
   // 917 NA
   916,
-  // 915,
+  915,
   // 914,
   // 913 NA
   // 912,
@@ -539,7 +539,7 @@ static int included_patches[] = {
   // 752,
   // 751 NA
   // 750 NA
-  // 749,
+  749,
   748,
   747,
   746,
diff --git a/test/functional/legacy/options_spec.lua b/test/functional/legacy/options_spec.lua
index 773acb9663..21e99c4aa1 100644
--- a/test/functional/legacy/options_spec.lua
+++ b/test/functional/legacy/options_spec.lua
@@ -1,13 +1,27 @@
--- Test if ":options" throws any exception. The options window seems to mess
--- other tests, so restart nvim in the teardown hook
-
 local helpers = require('test.functional.helpers')
 local command, clear = helpers.command, helpers.clear
+local source, expect = helpers.source, helpers.expect
 
 describe('options', function()
   setup(clear)
 
-  it('is working', function()
+  it('should not throw any exception', function()
     command('options')
   end)
 end)
+
+describe('set', function()
+  setup(clear)
+
+  it("should keep two comma when 'path' is changed", function()
+    source([[
+      set path=foo,,bar
+      set path-=bar
+      set path+=bar
+      $put =&path]])
+
+    expect([[
+      
+      foo,,bar]])
+  end)
+end)