aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-10-08 20:17:25 +0200
committerJohan Klokkhammer Helsing <johanhelsing@gmail.com>2015-11-22 20:03:41 +0100
commita86d4b323e2f5ee9fec791ca1dcce7a608de575d (patch)
tree21996ffb28447451e04977703a434767cf437ec3 /src/nvim/testdir
parent1fbb56795d16783f9a97e25e3b71ab3ac2a644dc (diff)
downloadrneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.tar.gz
rneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.tar.bz2
rneovim-a86d4b323e2f5ee9fec791ca1dcce7a608de575d.zip
vim-patch:7.4.785
Problem: On some systems automatically adding the missing EOL causes problems. Setting 'binary' has too many side effects. Solution: Add the 'fixeol' option, default on. (Pavel Samarkin) https://github.com/vim/vim/commit/34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc
Diffstat (limited to 'src/nvim/testdir')
-rw-r--r--src/nvim/testdir/Makefile1
-rw-r--r--src/nvim/testdir/test_fixeol.in40
-rw-r--r--src/nvim/testdir/test_fixeol.ok10
3 files changed, 51 insertions, 0 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile
index 8c3e99c624..3e597eb1af 100644
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@@ -29,6 +29,7 @@ SCRIPTS := test_eval.out \
test_charsearch.out \
test_close_count.out \
test_command_count.out \
+ test_fixeol.out \
SCRIPTS_GUI := test16.out
diff --git a/src/nvim/testdir/test_fixeol.in b/src/nvim/testdir/test_fixeol.in
new file mode 100644
index 0000000000..a881fb1b80
--- /dev/null
+++ b/src/nvim/testdir/test_fixeol.in
@@ -0,0 +1,40 @@
+Tests for 'fixeol' vim: set ft=vim :
+
+STARTTEST
+:" first write two test files – with and without trailing EOL
+:" use Unix fileformat for consistency
+:set ff=unix
+:enew!
+awith eol:w! XXEol
+:enew!
+:set noeol nofixeol
+awithout eol:w! XXNoEol
+:set eol fixeol
+:bwipe XXEol XXNoEol
+:"
+:" try editing files with 'fixeol' disabled
+:e! XXEol
+ostays eol:set nofixeol
+:w! XXTestEol
+:e! XXNoEol
+ostays without:set nofixeol
+:w! XXTestNoEol
+:bwipe XXEol XXNoEol XXTestEol XXTestNoEol
+:set fixeol
+:"
+:" Append "END" to each file so that we can see what the last written char was.
+ggdGaEND:w >>XXEol
+:w >>XXNoEol
+:w >>XXTestEol
+:w >>XXTestNoEol
+:"
+:" Concatenate the results
+:e! test.out
+a0:$r XXEol
+:$r XXNoEol
+Go1:$r XXTestEol
+:$r XXTestNoEol
+:w
+:qa!
+ENDTEST
+
diff --git a/src/nvim/testdir/test_fixeol.ok b/src/nvim/testdir/test_fixeol.ok
new file mode 100644
index 0000000000..68ac9be168
--- /dev/null
+++ b/src/nvim/testdir/test_fixeol.ok
@@ -0,0 +1,10 @@
+0
+with eol
+END
+without eolEND
+1
+with eol
+stays eol
+END
+without eol
+stays withoutEND