patch 7.4.1017

Problem:    When there is a backslash in an option ":set -=" doesn't work.
Solution:   Handle a backslash better. (Jacob Niehus)  Add a new test, merge
            in old test.

5 files changed, 28 insertions, 14 deletions

diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index f15a2dce2..b1e2ed834 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -3,5 +3,6 @@
 
 source test_lispwords.vim
 source test_searchpos.vim
+source test_set.vim
 source test_sort.vim
 source test_undolevels.vim
diff --git a/src/testdir/test_cdo.vim b/src/testdir/test_cdo.vim
index 10cd97c31..988de1dd2 100644
--- a/src/testdir/test_cdo.vim
+++ b/src/testdir/test_cdo.vim
@@ -1,6 +1,5 @@
 " Tests for the :cdo, :cfdo, :ldo and :lfdo commands
 
-lang mess C
 if !has('quickfix')
   finish
 endif
diff --git a/src/testdir/test_set.in b/src/testdir/test_set.in
deleted file mode 100644
index 5528ee6e3..000000000
--- a/src/testdir/test_set.in
+++ /dev/null
@@ -1,12 +0,0 @@
-Tests for :set     vim: set ft=vim :
-
-STARTTEST
-:so small.vim
-:set wildignore=*.png,
-:set wildignore+=*.jpg
-:$put =&wildignore
-:/^Output goes here/+1,$w! test.out
-:qa!
-ENDTEST
-
-Output goes here
diff --git a/src/testdir/test_set.ok b/src/testdir/test_set.ok
deleted file mode 100644
index 5d6a70872..000000000
--- a/src/testdir/test_set.ok
+++ /dev/null
@@ -1 +0,0 @@
-*.png,*.jpg
diff --git a/src/testdir/test_set.vim b/src/testdir/test_set.vim
new file mode 100644
index 000000000..b98046384
--- /dev/null
+++ b/src/testdir/test_set.vim
@@ -0,0 +1,27 @@
+" Tests for the :set command
+
+function Test_set_backslash()
+  let isk_save = &isk
+
+  set isk=a,b,c
+  set isk+=d
+  call assert_equal('a,b,c,d', &isk)
+  set isk+=\\,e
+  call assert_equal('a,b,c,d,\,e', &isk)
+  set isk-=e
+  call assert_equal('a,b,c,d,\', &isk)
+  set isk-=\\
+  call assert_equal('a,b,c,d', &isk)
+
+  let &isk = isk_save
+endfunction
+
+function Test_set_add()
+  let wig_save = &wig
+
+  set wildignore=*.png,
+  set wildignore+=*.jpg
+  call assert_equal('*.png,*.jpg', &wig)
+
+  let &wig = wig_save
+endfunction