aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Reed <m.reed@mykolab.com>2015-05-12 19:49:24 -0400
committerMichael Reed <m.reed@mykolab.com>2015-05-15 16:28:57 -0400
commit6f72f56492c0948371c746356458c1693efa85a3 (patch)
treeecf3f313be9d86a0075c359dcdddbd21868b9e8f /src
parenta822118e64c6ddcfdc4285ba1c8e3aa5fdb7a2a1 (diff)
downloadrneovim-6f72f56492c0948371c746356458c1693efa85a3.tar.gz
rneovim-6f72f56492c0948371c746356458c1693efa85a3.tar.bz2
rneovim-6f72f56492c0948371c746356458c1693efa85a3.zip
Change 'backspace' default to "indent,eol,start" #2639
While here, alphabetically sort section 2 of vim_diff.txt Helped-by: Jakob Schnitzer <mail@jakobschnitzer.de> Helped-by: Felipe Morales <hel.sheep@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/nvim/option.c4
-rw-r--r--src/nvim/testdir/test32.in1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 8aeeb7fe8b..91c8493419 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -430,9 +430,9 @@ static vimoption_T
(char_u *)"light",
(char_u *)0L
} SCRIPTID_INIT},
- {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
+ {"backspace", "bs", P_STRING|P_VIM|P_COMMA|P_NODUP,
(char_u *)&p_bs, PV_NONE,
- {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)"", (char_u *)"indent,eol,start"} SCRIPTID_INIT},
{"backup", "bk", P_BOOL|P_VI_DEF|P_VIM,
(char_u *)&p_bk, PV_NONE,
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
diff --git a/src/nvim/testdir/test32.in b/src/nvim/testdir/test32.in
index 02a41141ab..1a73c862d1 100644
--- a/src/nvim/testdir/test32.in
+++ b/src/nvim/testdir/test32.in
@@ -22,6 +22,7 @@ Test for insert expansion
STARTTEST
:so small.vim
+:se backspace=""
:se cpt=.,w ff=unix | $-2,$w!Xtestfile | set ff&
:se cot=
nO#include "Xtestfile"