runtime/doc/options.txt | 139 86 + 53 - 0 !
runtime/doc/various.txt | 12 9 + 3 - 0 !
runtime/doc/vim_diff.txt | 4 4 + 0 - 0 !
runtime/filetype.vim | 12 10 + 2 - 0 !
runtime/ftplugin/man.vim | 2 1 + 1 - 0 !
scripts/genoptions.lua | 1 1 + 0 - 0 !
src/nvim/buffer.c | 6 6 + 0 - 0 !
src/nvim/ex_cmds.c | 6 4 + 2 - 0 !
src/nvim/main.c | 2 1 + 1 - 0 !
src/nvim/memory.c | 31 14 + 17 - 0 !
src/nvim/option.c | 209 151 + 58 - 0 !
src/nvim/option_defs.h | 1 1 + 0 - 0 !
src/nvim/options.lua | 22 22 + 0 - 0 !
src/nvim/os/shell.c | 147 139 + 8 - 0 !
src/nvim/spell.c | 6 5 + 1 - 0 !
src/nvim/testdir/test49.in | 2 1 + 1 - 0 !
src/nvim/testdir/test_alot.vim | 1 1 + 0 - 0 !
src/nvim/testdir/test_autocmd.vim | 24 24 + 0 - 0 !
src/nvim/testdir/test_modeline.vim | 173 173 + 0 - 0 !
test/functional/autocmd/filetype_spec.lua | 17 17 + 0 - 0 !
test/functional/eval/execute_spec.lua | 17 11 + 6 - 0 !
test/functional/terminal/helpers.lua | 1 1 + 0 - 0 !
test/functional/ui/output_spec.lua | 21 21 + 0 - 0 !
test/functional/ui/screen.lua | 47 34 + 13 - 0 !
24 files changed, 737 insertions(+), 166 deletions(-)

 [patch 1/9] debcherry fixup patch

521039764 vim-patch:8.1.1401: misspelled mkspellmem as makespellmem
	 - no changes against upstream or conflicts
da70bb495 vim-patch:8.1.1368: modeline test fails with python but without pythonhome
	 - no changes against upstream or conflicts
f56248c5b vim-patch:8.1.1367: can set 'modelineexpr' in modeline
	 - no changes against upstream or conflicts
c0bbf5e36 vim-patch:8.1.1366: using expressions in a modeline is unsafe
	 - extra changes or conflicts
0c6cef14e vim-patch:8.1.0547: modeline test with keymap still fails
	 - extra changes or conflicts
ea1fa0c55 vim-patch:8.1.0546: modeline test with keymap fails
	 - no changes against upstream or conflicts
dee0f46e9 vim-patch:8.1.0506: modeline test fails when run by root
	 - no changes against upstream or conflicts
47f21af17 vim-patch:8.1.0205: invalid memory access with invalid modeline
	 - extra changes or conflicts
bb41a944b vim-patch:8.1.1046: the "secure" variable is used inconsistently
	 - no changes against upstream or conflicts
91afe084e vim-patch:8.1.0613: when executing an insecure function the secure flag is stuck
	 - extra changes or conflicts
758b1a4c9 vim-patch:8.1.0544: setting 'filetype' in a modeline causes an error
	 - extra changes or conflicts
3a4c0d5e4 vim-patch:8.1.0540: may evaluate insecure value when appending to option
	 - extra changes or conflicts
86774cc5c vim-patch:8.1.0539: cannot build without the sandbox
	 - extra changes or conflicts
dcb2d8eee vim-patch:8.1.0538: evaluating a modeline might invoke using a shell command
	 - extra changes or conflicts
7c5859b39 vim-patch:8.1.0067: syntax highlighting not working when re-entering a buffer
	 - extra changes or conflicts
d8e82af5f vim-patch:8.1.0066: nasty autocommand causes using freed memory
	 - extra changes or conflicts
224ac0db4 vim-patch-8.0.0649 and vim-patch-8.0.0650: autocmd open help 2 times
	 - extra changes or conflicts
53bde37a8 vim-patch:8.0.0376
	 - no changes against upstream or conflicts
aa0c704e7 vim-patch:8.0.0322
	 - extra changes or conflicts
7b3fc8096 out_data_decide_throttle(): timeout instead of hard limit.
	 - no changes against upstream or conflicts
443f03871 out_data_decide_throttle(): Avoid too-small final chunk.
	 - extra changes or conflicts
4fe8fc33e os/shell: do_os_system(): Always show last chunk.
	 - extra changes or conflicts
bd5444456 os/shell: Throttle :! output, pulse "..." message.
	 - extra changes or conflicts
29b888573 vim-patch:8.0.0057
	 - no changes against upstream or conflicts
fb1670cdd vim-patch:8.0.0056
	 - extra changes or conflicts

test/functional/core/job_spec.lua | 5 2 + 3 - 0 !
test/functional/fixtures/tty-test.c | 24 19 + 5 - 0 !
2 files changed, 21 insertions(+), 8 deletions(-)

 [patch 2/9] test: handle sighup in tty-test fixture.

Closes #5727

src/nvim/event/loop.c | 16 16 + 0 - 0 !
src/nvim/event/multiqueue.c | 51 36 + 15 - 0 !
src/nvim/lib/queue.h | 18 7 + 11 - 0 !
src/nvim/macros.h | 3 3 + 0 - 0 !
src/nvim/tui/input.c | 2 0 + 2 - 0 !
src/nvim/tui/tui.c | 15 15 + 0 - 0 !
src/nvim/ui.c | 7 3 + 4 - 0 !
src/nvim/ui_bridge.c | 33 27 + 6 - 0 !
src/nvim/ui_bridge.h | 2 1 + 1 - 0 !
src/nvim/version.c | 4 1 + 3 - 0 !
test/unit/multiqueue_spec.lua | 21 21 + 0 - 0 !
11 files changed, 130 insertions(+), 42 deletions(-)

 [patch 3/9] tui: "backpressure": drop messages to avoid flooding.

Closes #1234

multiqueue:
- Implement multiqueue_size()
- Rename MultiQueueItem.parent to MultiQueueItem.parent_item, to avoid confusion
  with MultiQueue.parent.

src/nvim/undo.c | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 [patch 4/9] vim-patch:8.0.0377

Problem:    Possible overflow when reading corrupted undo file.
Solution:   Check if allocated size is not too big. (King)

https://github.com/vim/vim/commit/3eb1637b1bba19519885dd6d377bd5596e91d22c

CVE-2017-6349

src/nvim/undo.c | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 [patch 5/9] vim-patch:8.0.0378

Problem:    Another possible overflow when reading corrupted undo file.
Solution:   Check if allocated size is not too big. (King)

https://github.com/vim/vim/commit/0c8485f0e4931463c0f7986e1ea84a7d79f10c75

CVE-2017-6350

src/nvim/getchar.c | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 [patch 6/9] vim-patch:8.1.1365: :source should check sandbox #10082

Problem:    Source command doesn't check for the sandbox. (Armin Razmjou)
Solution:   Check for the sandbox when sourcing a file.
https://github.com/vim/vim/commit/53575521406739cf20bbe4e384d88e7dca11f040

(cherry picked from commit 4553fc5e6cb6c8c43f57c173d01b31a61e51d13f)

Signed-off-by: James McCoy <jamessan@debian.org>

src/nvim/eval.c | 25 20 + 5 - 0 !
src/nvim/ex_cmds.lua | 2 1 + 1 - 0 !
2 files changed, 21 insertions(+), 6 deletions(-)

 [patch 7/9] vim-patch:8.1.0177: defining function in sandbox is
 inconsistent

Problem:    Defining function in sandbox is inconsistent, cannot use :function
            but can define a lambda.
Solution:   Allow defining a function in the sandbox, but also use the sandbox
            when executing it. (closes vim/vim#3182)
https://github.com/vim/vim/commit/93343725b5fa1cf580a24302455980faacae8ee2

(cherry picked from commit c202e4a86856594a6602a795314a081c497c2df5)

Signed-off-by: James McCoy <jamessan@debian.org>

src/nvim/testdir/test_alot.vim | 1 1 + 0 - 0 !
src/nvim/testdir/test_functions.vim | 18 18 + 0 - 0 !
2 files changed, 19 insertions(+)

 [patch 8/9] vim-patch:8.1.0189: function defined in sandbox not
 tested

Problem:    Function defined in sandbox not tested.
Solution:   Add a text.
https://github.com/vim/vim/commit/d90a144eda047816acffc7a8f297b43a7120710e

(cherry picked from commit f514b7fbbc75b4464af5abe44d5f859a0d904495)

Signed-off-by: James McCoy <jamessan@debian.org>

src/nvim/testdir/test49.in | 2 1 + 1 - 0 !
src/nvim/testdir/test49.vim | 3 1 + 2 - 0 !
src/nvim/testdir/test_viml.vim | 1 0 + 1 - 0 !
3 files changed, 2 insertions(+), 4 deletions(-)

 [patch 9/9] vim-patch:8.1.1382: error when editing test file

Problem:    Error when editing test file.
Solution:   Remove part of modeline.
https://github.com/vim/vim/commit/3020a87cb121123abf1e9a1eca0eddac241fc481

(cherry picked from commit 13f3a21226fdd31c42ba927ff12ac6c34c940311)

Signed-off-by: James McCoy <jamessan@debian.org>