From a86d4b323e2f5ee9fec791ca1dcce7a608de575d Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 8 Oct 2015 20:17:25 +0200 Subject: 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 --- src/nvim/testdir/Makefile | 1 + src/nvim/testdir/test_fixeol.in | 40 ++++++++++++++++++++++++++++++++++++++++ src/nvim/testdir/test_fixeol.ok | 10 ++++++++++ 3 files changed, 51 insertions(+) create mode 100644 src/nvim/testdir/test_fixeol.in create mode 100644 src/nvim/testdir/test_fixeol.ok (limited to 'src/nvim/testdir') 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 -- cgit