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>

5 files changed, 11 insertions, 9 deletions

diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index df1c5c92cb..e4cec778bf 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -70,8 +70,8 @@ CTRL-A		Insert previously inserted text.
 						*i_<Del>* *i_DEL*
 <Del>		Delete the character under the cursor.  If the cursor is at
 		the end of the line, and the 'backspace' option includes
-		"eol", delete the <EOL>; the next line is appended after the
-		current one.
+		"eol" (the default), delete the <EOL>; the next line is
+		appended after the current one.
 						*i_CTRL-W*
 CTRL-W		Delete the word before the cursor (see |i_backspacing| about
 		joining lines).  See the section "word motions",
@@ -319,9 +319,8 @@ The following keys are special.  They stop the current insert, do something,
 and then restart insertion.  This means you can do something without getting
 out of Insert mode.  This is very handy if you prefer to use the Insert mode
 all the time, just like editors that don't have a separate Normal mode.  You
-may also want to set the 'backspace' option to "indent,eol,start" and set the
-'insertmode' option.  You can use CTRL-O if you want to map a function key to
-a command.
+may also want to set the 'insertmode' option.  You can use CTRL-O if you want
+to map a function key to a command.
 
 The changes (inserted or deleted characters) before and after these keys can
 be undone separately.  Only the last change can be redone and always behaves
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 69576c3572..9aeeaec46a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -818,7 +818,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	done with ":syntax on".
 
 							*'backspace'* *'bs'*
-'backspace' 'bs'	string	(default "")
+'backspace' 'bs'	string	(default "indent,eol,start")
 			global
 	Influences the working of <BS>, <Del>, CTRL-W and CTRL-U in Insert
 	mode.  This is a list of items, separated by commas.  Each item allows
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 215b0edb94..20653f03bc 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -28,8 +28,10 @@ these differences.
 ==============================================================================
 2. Option defaults					  *nvim-option-defaults*
 
-- 'nocompatible' is always set
+- 'backspace' defaults to "indent,eol,start"
 - 'encoding' defaults to "utf-8"
+- 'nocompatible' is always set
+- 'ttyfast' is always set
 
 ==============================================================================
 3. Changed features					 *nvim-features-changed*
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"