NVIM v0.4.0

This release represents ~2700 commits since v0.3.4, the previous non-maintenance release. Besides the highlights listed below, this release features vast improvements to documentation, internal subsystems and test/CI infrastructure, and 700+ patches merged from Vim. FEATURES: New API functions: nvim_create_buf: create various kinds of buffers nvim_get_context, nvim_load_context 8e6b0a73c9 #10619 API: Context: save/restore/inspect editor state nvim_input_mouse: perform mouse actions nvim_open_win: create floating windows (and external, for supporting UIs) nvim_paste: paste text at cursor nvim_put: put text at cursor nvim_select_popupmenu_item: perform popupmenu actions nvim_set_keymap: create/delete mappings nvim_set_vvar: set v: variables nvim_ui_pum_set_height nvim_ui_try_resize_grid nvim_win_close: close windows nvim_win_get_config: get window configuration nvim_win_set_config: reconfigure windows New UI events: redraw.grid_destroy redraw.hl_group_set 8a3f8589a3 #10504 UI/highlight: expose builtin highlight groups using hl_group_set event redraw.msg_clear redraw.msg_history_show redraw.msg_ruler redraw.msg_set_pos redraw.msg_show redraw.msg_showcmd redraw.msg_showmode redraw.win_close redraw.win_external_pos redraw.win_float_pos redraw.win_hide redraw.win_pos API f5c56f03bb #9170 API/Lua: nvim_buf_attach: support Lua callback 82d48c0dab #9896 API: emit nvim_error_event on failed async request b9ad12e6c2 #9992 UI/nvim_ui_attach(): add `override` option 3d1ed7c959 #9993 UI/ext_messages: learn more message kinds 8ed54bbec3 #9547 proper multiline error message for rpcrequest, API wrappers Lua This release introduces "Nvim-Lua standard library". See ":help lua-stdlib". 89d7e24891 #9463 Lua stdlib: vim.inspect, string functions 8e941c59ec #9740 Lua: generate documentation from docstrings 1cbe014569 #9301 lua/stdlib: Introduce vim.shared c83926cd0a #10123 Lua: introduce vim.loop (expose libuv event-loop) 81e1dbca99 #10120 Lua: vim.schedule(cb) 1f54f68732 #10688 Lua: minimal UTF-16 support needed for LSP 6fb0020df4 #10513 Lua encoding support c0993ed343 Lua: support getting UTF-32 and UTF-16 sizes of replaced text b0e26199ec Lua: add {old_byte_size} to on_lines buffer change event UI: - The Nvim 0.3.4 UI protocol introduced line-based updates instead of legacy char-based updates. Nvim 0.4 continues to evolve the UI protocol. See ":help ui". Legacy UI clients are supported. See ":help api-contract". 9a1675b065 #6619 Floating windows - Can be (re)positioned, anchored, external. - Are real windows showing real buffers. No shortcuts, hacks, or compromises. - Support all features and API of normal windows, plus more. 6427894d89 #8455 Multigrid: "windows drawn on separate grids" - Windows are logically isolated internally. - Windows are sent to UIs as distinct objects, so that UIs can control layout instead of being stuck with the classic TUI layout. - Per-window font-size, dimenions, line-spacing. - Compositor: Internal subsystem for composing grids. 3855204f58 #6917 UIEnter, UILeave 788bcbba24 #9923 ui: ":syn blend=", 'winblend' 7cf7c0a0b8 #9575 ui: 'redrawdebug' option for flexible debugging of redrawing 5c836d2ef8 #9607 wildoptions=pum (enabled by default) 37f8df8824 #9571 UI: 'pumblend' option for semi-transparent popupmenu c403a95a52 #9446 Visual: highlight char-at-cursor - Traditionally Vim's visual selection does "reverse mode", which perhaps conflicts with the non-blinking block cursor. But 'guicursor' defaults to a vertical bar for selection=exclusive, and this confuses users who expect to see the text highlighted. :terminal fc27dc98d7 #8550 autocmds: TermEnter, TermLeave d13803f64f #9810 keymap, terminal: more keycodes 3b56f59532 #9535 :terminal : Fix F1-F4 key codes 2d4a37ebab #10370 :ls : show "R", "F" for terminal-jobs fd0fd752c8 #9966 terminal: swap priority of terminal, editor highlights 7bb858c39c #9494 libvterm 0.1 TUI 3afb397407 syntax, TUI: support "strikethrough" ccbcd390d4 #9408 TUI: "title stacking" unconditionally 298608f88c #9509 TUI: detect background color, set bg=dark/light 42f492ac99 #9097 TUI: handle Smulx extension capability (extended underline) 424ddd01f5 #10205 TUI: support rgba background detection 9b4383261a #9601 TUI: italics in tmux, Terminal.app f6fb370b1b #9793 keymap: support more (keypad) keycodes 3340e08bec #9423 TUI: Konsole DECSCUSR fixup :checkhealth d0fd66ba82 health/provider.vim: check curl HTTPS support c38862acea #10490 checkhealth: try yarn if npm is missing 43356a43d0 #9929 health: check if tmux enabled true colors ec5a4d862d #9548 checkhealth: validate locale providers (clipboard, python, etc.): 96be8a2c4d #10161 Allow reloading providers (useful for UIs/clients) db3c797c6b #9487 provider: improve error message if provider is missing Various: 36762a00a8 #9295 signs: support multiple columns 801fe799ff #10382 eval: wait() (wait for any condition) 9df3a676e7 #10400 MsgArea highlight; message grid a9bea8c104 #10790 keymap: allow modifiers to multibyte chars, like <m-ä> 25e0a449bb #10878 #4448 paste: redesign (10x+ faster pasting; extensible vim.paste Lua hook) ef5037e7f6 #9706 autocmd: introduce "++once" feature 175398f216 #9616 add CompleteChanged autocmd 7fcf2f926f #9717 TextYankPost: add v:event["inclusive"] 3a699a790c #8364 termdebug.vim plugin ca1ce59025 #9709 performance: use os_copy to create backups ed0e96cd28 man.vim: set 'linebreak' 70f6939fd4 #9564 events: add "Signal" event f89d0d8230 #9568 inccommand: auto-disable if folding is slow FIXES: 41bb68b8e8 #10584 process_stop: uv: do not close stdin first/explicitly e50aa2a6c6 #10117 normal: Don't exit CTRL-O mode after processing K_EVENT 95fa71c6d2 #9504 :recover : Fix crash on non-existent *.swp 5a836d4767 #9507 screen: don't unconditionally clear messages on window scroll 149dcbf2c7 #10021 channel: refactor events, prevent recursive invocation of events d19ff73b39 #10107 Fix multiple c_CTRL-D showing statusline b65a7b7f66 #10103 Fix wildmode=list,full and display+=msgsep interaction 0be6d3c86f #9634 fsync: Ignore ENOTSUP. Fix writing to SMB. b247c6fd22 #10025 kbtree: pointer UB and unitialized value fixes 018e0d5a19 #9643 API/buffer-updates: always detach on buf-reload 400ee59247 #9961 API: fix cursor position when lines are added 769f44e918 #9911 win/defaults: Use "…/nvim-data/site" in 'runtimepath' 83d571653b #9911 spellfile.vim: store files in stdpath('data') 8dbf23181a #9887 RPC: conform message-id type to msgpack-RPC spec 5f996e36d1 #9894 options: properly reset directories on 'autochdir' 4c4a570156 #9807 various CursorMoved fixes 943bedfc86 #9853 event-loop: do not set CA_COMMAND_BUSY 9d207fd876 #9693 dictwatcheradd(): support b:changedtick 2d50bf3498 #9789 mac: fix locale detection c5631338b1 #9754 :mksession : restore tab-local working directories 092e7e6c60 #9703 #9703 executable(): return false if user is not owner 11a481f711 #9686 env var fixes/improvements 8e54847fdf #9666 #7920 os/env: Fix completion of multibyte env var names 519382646b #10468 Fix is_executable_in_path() on Windows 8eaa452073 #9516 win: exepath(), executable() fixes f55c1e4233 #10544 reltimefloat(): allow negative result b08dc3ec19 #10561 win: jobstart(), system(): $PATHEXT-resolve exe 7cc2b723d4 #10392 TextYankPost: spurious/too-early dispatch during delete 6e01ed6a4c OpenBSD: stop jobs/processes properly 58dd5fcc01 #10522 jobstop(): close channel before process_stop() 83632022f8 #10959 improved resize behavior (all UIs) c6eb1f42be #10830 API: fix nvim_command_output buffer overflow cbfd18c85a #10763 startup: handle 'guicursor' after user config b8f2436feb #10915 jobwait(): fix race if job exits quickly 2fafed6bb8 #10765 clipboard: handle/avoid SIGTERM with previous owner 8aca932aa0 #9954 clipboard: setreg("*") with clipboard=unnamed 3f10c5b533 #9480 performance: clipboard/macOS: assume that pbcopy works 48efafc81c #10398 screen: disable redrawing inside VimResized 5e4b93a38f #10389 API/Lua: make nvim_execute_lua use native lua floats, not special tables 8c6f5b7f92 #9934 Spurious quote mark in command line when typing <C-R> a8a38f3465 Lua 5.2/5.3 compat :terminal 47b7b471fa #10700 :terminal : update buffer when switching tabpage 5225c1ec30 #9605 terminal: Fix potential invalid local 'scrollback' 894f6bee54 #8325 :terminal : set topline based on window height 8171e96b96 #9551 Improve :terminal resize d928b036dc #9856 :stopinsert should leave terminal-mode 3f71218505 #9926 :terminal : fix: Using `:stopinsert` while in normal mode 5020daa6e5 #9883 ui/terminal: make terminal state redraw like any other state TUI: 9f19e8d29d #9443 TUI: Do not disable BCE for builtin terminfos a4076e5dcf #9474 win/TUI: fix text overrides line numbers 533d4a36ec #9645 TUI: do not resize host-terminal on startup b51e5d8b8d #9688 tui_tk_ti_getstr: handle weird value 1f5eac1115 #10785 TUI: fix data-race during resize CHANGES: 9697c7f56a #8194 fix menu_get() 7f2e43c637 #9520 improve Lua error messages c2343180d7 #9526 Remove jemalloc baf93d9606 #9581 UI: always use concrete colors for default_colors_set 91688b4883 #9563 defaults: set 'scrollback' to -1 by default bb24fec333 #10136 defaults: exclude "S" from 'shortmess' ddd0eb6f51 #8540 startup: -es/-Es (silent/batch mode): skip swapfile 35362495c9 #9805 jumplist: avoid extra tail entry 939d9053bd #10573 channels: reflect exit due to signals in exit status code 45c34bd84a #10689 :doautocmd : Never show "No matching autocommands" fb19aeeb33 #9110 API: make nvim_win_set_option() set window-global, not buffer-local abfc8b3257 #10778 emsg_multiline: log Vim errors 06d9cc734b #10657 exists("$FOO"): return false for empty env var 6616d1d3e5 #10743 win/env: Vim-compat: Empty string deletes env var 7d664837e1 #10662 win: expand nested env var in $HOME 2816bc8620 #8349 edit.c: Disable indent during completion 58f505dc74 #9829 startup: remove TUI init special-case Historically Vim/Nvim does backflips to handle input and show messages before a UI is available. This logical contradiction was already fixed for remote UIs (#9024 c236e80cf3). Fixing it also for the TUI avoids problems on Windows, simplifies the logic, and avoids races like #9959.
Merge pull request #11025 from bfredl/doublescroll
2025-09-06 11:28:22 +00:00 · 2019-09-15 12:38:40 -07:00 · 2019-09-15 16:53:43 +02:00 · 2019-09-15 15:55:50 +02:00 · 2019-09-15 15:30:48 +02:00 · 2019-09-15 08:26:54 -04:00
839 changed files with 80606 additions and 34913 deletions
--- a/.builds/openbsd.yml
+++ b/.builds/openbsd.yml
@@ -0,0 +1,41 @@
+# sourcehut CI: https://builds.sr.ht/~jmk/neovim
+
+image: openbsd/6.5
+
+packages:
+- autoconf-2.69p2
+- automake-1.15.1
+- cmake
+- gettext-0.19.8.1p3
+- gettext-tools-0.19.8.1
+- gmake
+- libtool
+- ninja-1.8.2p0
+- unzip-6.0p11
+
+sources:
+- https://github.com/neovim/neovim
+
+tasks:
+- build: |
+    export AUTOCONF_VERSION=2.69
+    export AUTOMAKE_VERSION=1.15
+    cd neovim
+    mkdir .deps
+    cd .deps
+    cmake -G Ninja ../third-party/
+    cmake --build . --config Debug
+    cd ..
+    mkdir build
+    cd build
+    cmake -G Ninja -DMIN_LOG_LEVEL=3 ..
+    cmake --build . --config Debug
+    ./bin/nvim --version
+- test: |
+    export LC_CTYPE=en_US.UTF-8
+    # functional tests
+    cd neovim/build
+    # cmake --build . --config Debug --target functionaltest
+    # oldtests
+    cd ..
+    gmake oldtest
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,6 +3,7 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
+tab_width = 8
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
--- a/.flake8
+++ b/.flake8
@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 88
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.h linguist-language=C
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://salt.bountysource.com/teams/neovim
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report a problem in Nvim
+title: ''
+labels: bug
+
+---
+
+<!-- Before reporting: search existing issues and check the FAQ. -->
+
+- `nvim --version`:
+- `vim -u DEFAULTS` (version: ) behaves differently?
+- Operating system/version:
+- Terminal name/version:
+- `$TERM`:
+
+### Steps to reproduce using `nvim -u NORC`
+
+```
+nvim -u NORC
+# Alternative for shell-related problems:
+# env -i TERM=ansi-256color "$(which nvim)"
+
+```
+
+### Actual behaviour
+
+### Expected behaviour
+
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,15 @@
+---
+name: Feature request
+about: Request an enhancement for Nvim
+title: ''
+labels: enhancement
+
+---
+
 <!-- Before reporting: search existing issues and check the FAQ. -->

 - `nvim --version`:
- Vim (version: ) behaves differently?
+- `vim -u DEFAULTS` (version: ) behaves differently?
 - Operating system/version:
 - Terminal name/version:
 - `$TERM`:
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Tools
 .ropeproject/
+compile_commands.json
 # Visual Studio
 /.vs/

@@ -40,12 +41,15 @@ tags
 /src/nvim/testdir/X*
 /src/nvim/testdir/valgrind.*
 /src/nvim/testdir/.gdbinit
+/runtime/indent/testdir/*.out
+# Generated by src/nvim/testdir/runnvim.sh.
+/src/nvim/testdir/*.tlog

 # Generated by unit tests.
 /test/includes/post/

-# Generated by luacheck during `make testlint'
-/test/.luacheckcache
+# Generated by luacheck during `make lualint'
+.luacheckcache

 # local make targets
 local.mk
@@ -54,3 +58,6 @@ local.mk
 /runtime/doc/*.html
 /runtime/doc/tags.ref
 /runtime/doc/errors.log
+
+# CLion
+/.idea/
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -0,0 +1,20 @@
+-- vim: ft=lua tw=80
+
+-- Ignore W211 (unused variable) with preload files.
+files["**/preload.lua"] = {ignore = { "211" }}
+
+-- Don't report unused self arguments of methods.
+self = false
+
+-- Rerun tests only if their modification time changed.
+cache = true
+
+ignore = {
+  "631",  -- max_line_length
+  "212/_.*",  -- unused argument, for vars with "_" prefix
+}
+
+-- Global objects defined by the C code
+read_globals = {
+  "vim",
+}
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,6 @@ env:
    - BUILD_DIR="$TRAVIS_BUILD_DIR/build"
    # Build directory for third-party dependencies.
    - DEPS_BUILD_DIR="$HOME/nvim-deps"
-    # Directory where third-party dependency sources are downloaded to.
-    - DEPS_DOWNLOAD_DIR="$TRAVIS_BUILD_DIR/deps-downloads"
    # Install directory for Neovim.
    - INSTALL_PREFIX="$HOME/nvim-install"
    # Log directory for Clang sanitizers and Valgrind.
@@ -25,7 +23,7 @@ env:
                   -DBUSTED_OUTPUT_TYPE=nvim
                   -DDEPS_PREFIX=$DEPS_BUILD_DIR/usr
                   -DMIN_LOG_LEVEL=3"
-    - DEPS_CMAKE_FLAGS="-DDEPS_DOWNLOAD_DIR:PATH=$DEPS_DOWNLOAD_DIR -DUSE_BUNDLED_GPERF=OFF"
+    - DEPS_CMAKE_FLAGS="-DUSE_BUNDLED_GPERF=OFF"
    # Additional CMake flags for 32-bit builds.
    - CMAKE_FLAGS_32BIT="-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32
                         -DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib
@@ -34,11 +32,11 @@ env:
    - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan"
    - TSAN_OPTIONS="log_path=$LOG_DIR/tsan"
    - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan"
-    - ASAN_SYMBOLIZE=asan_symbolize
    # Environment variables for Valgrind.
    - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log"
+    - CACHE_NVIM_DEPS_DIR="$HOME/.cache/nvim-deps"
    # If this file exists, the cache is valid (compile was successful).
-    - CACHE_MARKER="$HOME/.cache/nvim-deps/.travis_cache_marker"
+    - CACHE_MARKER="$CACHE_NVIM_DEPS_DIR/.travis_cache_marker"
    # default target name for functional tests
    - FUNCTIONALTEST=functionaltest
    - CI_TARGET=tests
@@ -46,66 +44,25 @@ env:
    - CCACHE_COMPRESS=1
    - CCACHE_SLOPPINESS=time_macros,file_macro
    - CCACHE_BASEDIR="$TRAVIS_BUILD_DIR"
+    # Default since 3.3, but Travis (Xenial) has 3.2.4; required with newer gcc/clang.
+    - CCACHE_CPP2=1

-jobs:
-  include:
-    - stage: normal builds
-      os: linux
-      compiler: clang-4.0
-      # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
-      env: >
-        CLANG_SANITIZER=ASAN_UBSAN
-        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        ASAN_SYMBOLIZE=asan_symbolize-4.0
-    - os: linux
-      compiler: gcc
-      env: >
-        FUNCTIONALTEST=functionaltest-lua
-        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
-        DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
-    - os: linux
-      # Travis creates a cache per compiler. Set a different value here to
-      # store 32-bit dependencies in a separate cache.
-      compiler: gcc
-      env: BUILD_32BIT=ON
-    - os: osx
-      compiler: clang
-      osx_image: xcode9.4  # macOS 10.13
-    - os: osx
-      compiler: gcc
-      osx_image: xcode9.4  # macOS 10.13
-    - if: branch = master
-      os: linux
-      env: CI_TARGET=lint
-    - stage: Flaky builds
-      os: linux
-      compiler: gcc
-      env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
-    - os: linux
-      compiler: clang
-      env: CLANG_SANITIZER=TSAN
-  allow_failures:
-    - env: GCOV=gcov CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
-    - env: CLANG_SANITIZER=TSAN
-  fast_finish: true
-
-before_install: ci/before_install.sh
-install:        ci/install.sh
-before_script:  ci/before_script.sh
-script:         ci/script.sh
-before_cache:   ci/before_cache.sh
+anchors:
+  envs: &common-job-env
+    # Do not fall back to cache for "master" for PR on "release" branch:
+    # adds the target branch to the cache key.
+    FOR_TRAVIS_CACHE=v1-$TRAVIS_BRANCH

 addons:
  apt:
-    packages:
+    packages: &common-apt-packages
      - apport
      - autoconf
      - automake
      - build-essential
-      - clang-4.0
+      - clang
      - cmake
      - cscope
-      - g++-multilib
      - gcc-multilib
      - gdb
      - gperf
@@ -119,11 +76,83 @@ addons:
      - valgrind
      - xclip
  homebrew:
-    update: true
+    update: false
    packages:
      - ccache
      - ninja

+jobs:
+  include:
+    - stage: baseline
+      name: clang-asan
+      os: linux
+      compiler: clang
+      # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
+      env:
+        - CLANG_SANITIZER=ASAN_UBSAN
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        - *common-job-env
+    - name: gcc-coverage (gcc 9)
+      os: linux
+      compiler: gcc-9
+      env:
+        - GCOV=gcov-9
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_GCOV=ON"
+        - GCOV_ERROR_FILE="/tmp/libgcov-errors.log"
+        - *common-job-env
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+          packages:
+            - *common-apt-packages
+            - gcc-9
+    - if: branch = master AND commit_message !~ /\[skip.lint\]/
+      name: lint
+      os: linux
+      env:
+        - CI_TARGET=lint
+        - *common-job-env
+
+    - stage: second stage
+      name: "macOS: clang"
+      os: osx
+      compiler: clang
+      osx_image: xcode10.2  # macOS 10.14
+      env:
+        - *common-job-env
+    - name: gcc-functionaltest-lua
+      os: linux
+      compiler: gcc
+      env:
+        - FUNCTIONALTEST=functionaltest-lua
+        - CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
+        - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF"
+        - *common-job-env
+    - name: gcc-32bit
+      os: linux
+      # Travis creates a cache per compiler. Set a different value here to
+      # store 32-bit dependencies in a separate cache.
+      compiler: gcc
+      env:
+        - BUILD_32BIT=ON
+        # Minimum required CMake.
+        - CMAKE_URL=https://cmake.org/files/v2.8/cmake-2.8.12-Linux-i386.sh
+        - *common-job-env
+    - name: clang-tsan
+      os: linux
+      compiler: clang
+      env:
+        - CLANG_SANITIZER=TSAN
+        - *common-job-env
+  fast_finish: true
+
+before_install: ci/before_install.sh
+install:        ci/install.sh
+before_script:  ci/before_script.sh
+script:         ci/script.sh
+before_cache:   ci/before_cache.sh
+
 branches:
  only:
    - master
@@ -133,9 +162,10 @@ cache:
  apt: true
  ccache: true
  directories:
-    - "$HOME/.cache/pip"
-    - "$HOME/.cache/nvim-deps"
-    - "$HOME/.cache/nvim-deps-downloads"
+    - "$CACHE_NVIM_DEPS_DIR"
+
+git:
+  quiet: true

 notifications:
  webhooks:
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,16 +2,10 @@
 #   intro: https://codingnest.com/basic-cmake/
 #   best practices (3.0+): https://gist.github.com/mbinna/c61dbb39bca0e4fb7d1f73b0d66a4fd1

+# Version should match the tested CMAKE_URL in .travis.yml.
 cmake_minimum_required(VERSION 2.8.12)
 project(nvim C)

-if(POLICY CMP0059)
-  # Needed for use of DEFINITIONS variable, which is used to collect the
-  # compilation flags for reporting in "nvim --version"
-  # https://github.com/neovim/neovim/pull/8558#issuecomment-398033140
-  cmake_policy(SET CMP0059 OLD)
-endif()
-
 # Point CMake at any custom modules we may ship
 list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")

@@ -97,26 +91,34 @@ else()
  option(ENABLE_LTO "enable link time optimization" ON)
 endif()

-# Set default build type.
-if(NOT CMAKE_BUILD_TYPE)
-  message(STATUS "CMAKE_BUILD_TYPE not given, defaulting to 'Debug'")
-  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
-endif()
+message(STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")

+# Build type.
+if(NOT CMAKE_BUILD_TYPE)
+  message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'")
+  set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build" FORCE)
+else()
+  message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
+endif()
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+  set(DEBUG 1)
+else()
+  set(DEBUG 0)
+endif()
 # Set available build types for CMake GUIs.
-# A different build type can still be set by -DCMAKE_BUILD_TYPE=...
+# Other build types can still be set by -DCMAKE_BUILD_TYPE=...
 set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
  STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")

 # If not in a git repo (e.g., a tarball) these tokens define the complete
 # version string, else they are combined with the result of `git describe`.
 set(NVIM_VERSION_MAJOR 0)
-set(NVIM_VERSION_MINOR 3)
-set(NVIM_VERSION_PATCH 4)
+set(NVIM_VERSION_MINOR 4)
+set(NVIM_VERSION_PATCH 0)
 set(NVIM_VERSION_PRERELEASE "") # for package maintainers

 # API level
-set(NVIM_API_LEVEL 5)         # Bump this after any API change.
+set(NVIM_API_LEVEL 6)         # Bump this after any API change.
 set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
 set(NVIM_API_PRERELEASE false)

@@ -138,12 +140,6 @@ set(NVIM_VERSION_BUILD_TYPE "${CMAKE_BUILD_TYPE}")

 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

-# Default to -O2 on release builds.
-if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
-  message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
-  string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-endif()
-
 # Minimize logging for release-type builds.
 if(NOT CMAKE_C_FLAGS_RELEASE MATCHES DMIN_LOG_LEVEL)
  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DMIN_LOG_LEVEL=3")
@@ -155,6 +151,22 @@ if(NOT CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES DMIN_LOG_LEVEL)
  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DMIN_LOG_LEVEL=3")
 endif()

+# Log level (MIN_LOG_LEVEL in log.h)
+if("${MIN_LOG_LEVEL}" MATCHES "^$")
+  message(STATUS "MIN_LOG_LEVEL not specified, default is 1 (INFO)")
+else()
+  if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
+    message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
+  endif()
+  message(STATUS "MIN_LOG_LEVEL=${MIN_LOG_LEVEL}")
+endif()
+
+# Default to -O2 on release builds.
+if(CMAKE_C_FLAGS_RELEASE MATCHES "-O3")
+  message(STATUS "Replacing -O3 in CMAKE_C_FLAGS_RELEASE with -O2")
+  string(REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCC)
  check_c_compiler_flag(-Og HAS_OG_FLAG)
 else()
@@ -172,11 +184,6 @@ if(CMAKE_C_FLAGS_RELWITHDEBINFO MATCHES DNDEBUG)
  string(REPLACE "-DNDEBUG" "" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
 endif()

-# Enable -Wconversion.
-if(NOT MSVC)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wconversion")
-endif()
-
 # gcc 4.0+ sets _FORTIFY_SOURCE=2 automatically.  This currently
 # does not work with Neovim due to some uses of dynamically-sized structures.
 # https://github.com/neovim/neovim/issues/223
@@ -243,28 +250,40 @@ check_c_source_compiles("
 int main(void)
 {
  void *trace[1];
-  int trace_size = backtrace(trace, 1);
+  backtrace(trace, 1);
  return 0;
 }
 " HAVE_EXECINFO_BACKTRACE)

+check_c_source_compiles("
+int main(void)
+{
+  int a = 42;
+  __builtin_add_overflow(a, a, &a);
+  __builtin_sub_overflow(a, a, &a);
+  return 0;
+}
+" HAVE_BUILTIN_ADD_OVERFLOW)
+
 if(MSVC)
  # XXX: /W4 gives too many warnings. #3241
-  add_definitions(/W3 -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
+  add_compile_options(/W3)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE)
  add_definitions(-DWIN32)
 else()
-  add_definitions(-Wall -Wextra -pedantic -Wno-unused-parameter
-    -Wstrict-prototypes -std=gnu99)
+  add_compile_options(-Wall -Wextra -pedantic -Wno-unused-parameter
+    -Wstrict-prototypes -std=gnu99 -Wshadow -Wconversion
+    -Wmissing-prototypes)

  check_c_compiler_flag(-Wimplicit-fallthrough HAS_WIMPLICIT_FALLTHROUGH_FLAG)
  if(HAS_WIMPLICIT_FALLTHROUGH_FLAG)
-    add_definitions(-Wimplicit-fallthrough)
+    add_compile_options(-Wimplicit-fallthrough)
  endif()

  # On FreeBSD 64 math.h uses unguarded C11 extension, which taints clang
  # 3.4.1 used there.
  if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND CMAKE_C_COMPILER_ID MATCHES "Clang")
-    add_definitions(-Wno-c11-extensions)
+    add_compile_options(-Wno-c11-extensions)
  endif()
 endif()

@@ -280,7 +299,7 @@ endif()
 # OpenBSD's GCC (4.2.1) doesn't have -Wvla
 check_c_compiler_flag(-Wvla HAS_WVLA_FLAG)
 if(HAS_WVLA_FLAG)
-  add_definitions(-Wvla)
+  add_compile_options(-Wvla)
 endif()

 if(UNIX)
@@ -289,26 +308,18 @@ if(UNIX)
  check_c_compiler_flag(-fstack-protector HAS_FSTACK_PROTECTOR_FLAG)

  if(HAS_FSTACK_PROTECTOR_STRONG_FLAG)
-    add_definitions(-fstack-protector-strong)
+    add_compile_options(-fstack-protector-strong)
  elseif(HAS_FSTACK_PROTECTOR_FLAG)
-    add_definitions(-fstack-protector --param ssp-buffer-size=4)
+    add_compile_options(-fstack-protector --param ssp-buffer-size=4)
  endif()
 endif()

 check_c_compiler_flag(-fdiagnostics-color=auto HAS_DIAG_COLOR_FLAG)
 if(HAS_DIAG_COLOR_FLAG)
-  add_definitions(-fdiagnostics-color=auto)
-endif()
-
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
-  # 1. Array-bounds testing is broken in some GCC versions before 4.8.5.
-  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56273
-  # 2. But _Pragma("...ignored") is broken (unresolved) in GCC 5+:
-  #    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66099
-  # So we must disable -Warray-bounds globally for GCC (for kbtree.h, #7083).
-  check_c_compiler_flag(-Wno-array-bounds HAS_NO_ARRAY_BOUNDS_FLAG)
-  if(HAS_NO_ARRAY_BOUNDS_FLAG)
-    add_definitions(-Wno-array-bounds)
+  if(CMAKE_GENERATOR MATCHES "Ninja")
+    add_compile_options(-fdiagnostics-color=always)
+  else()
+    add_compile_options(-fdiagnostics-color=auto)
  endif()
 endif()

@@ -316,19 +327,13 @@ option(TRAVIS_CI_BUILD "Travis/QuickBuild CI, extra flags will be set" OFF)

 if(TRAVIS_CI_BUILD)
  message(STATUS "Travis/QuickBuild CI build enabled")
-  add_definitions(-Werror)
+  add_compile_options(-Werror)
  if(DEFINED ENV{BUILD_32BIT})
    # Get some test coverage for unsigned char
-    add_definitions(-funsigned-char)
+    add_compile_options(-funsigned-char)
  endif()
 endif()

-if(CMAKE_BUILD_TYPE MATCHES Debug)
-  set(DEBUG 1)
-else()
-  set(DEBUG 0)
-endif()
-
 option(LOG_LIST_ACTIONS "Add list actions logging" OFF)

 add_definitions(-DINCLUDE_GENERATED_DECLARATIONS)
@@ -361,12 +366,15 @@ endif()
 include_directories("${PROJECT_BINARY_DIR}/config")
 include_directories("${PROJECT_SOURCE_DIR}/src")

-find_package(LibUV REQUIRED)
+find_package(LibUV 1.28.0 REQUIRED)
 include_directories(SYSTEM ${LIBUV_INCLUDE_DIRS})

 find_package(Msgpack 1.0.0 REQUIRED)
 include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS})

+find_package(LibLUV 1.30.0 REQUIRED)
+include_directories(SYSTEM ${LIBLUV_INCLUDE_DIRS})
+
 # Note: The test lib requires LuaJIT; it will be skipped if LuaJIT is missing.
 option(PREFER_LUA "Prefer Lua over LuaJIT in the nvim executable." OFF)

@@ -392,7 +400,7 @@ main(void)
  return MSGPACK_OBJECT_FLOAT32;
 }
 " MSGPACK_HAS_FLOAT32)
-unset(CMAKE_REQUIRED_LIBRARIES)
+list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${MSGPACK_INCLUDE_DIRS}")
 if(MSGPACK_HAS_FLOAT32)
  add_definitions(-DNVIM_MSGPACK_HAS_FLOAT32)
 endif()
@@ -400,7 +408,7 @@ endif()
 option(FEAT_TUI "Enable the Terminal UI" ON)

 if(FEAT_TUI)
-  find_package(Unibilium REQUIRED)
+  find_package(UNIBILIUM 2.0 REQUIRED)
  include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS})

  list(APPEND CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
@@ -414,8 +422,8 @@ if(FEAT_TUI)
    return unibi_num_from_var(unibi_var_from_num(0));
  }
  " UNIBI_HAS_VAR_FROM)
-  unset(CMAKE_REQUIRED_INCLUDES)
-  unset(CMAKE_REQUIRED_LIBRARIES)
+  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${UNIBILIUM_INCLUDE_DIRS}")
+  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${UNIBILIUM_LIBRARIES}")
  if(UNIBI_HAS_VAR_FROM)
    add_definitions(-DNVIM_UNIBI_HAS_VAR_FROM)
  endif()
@@ -424,7 +432,7 @@ if(FEAT_TUI)
  include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
 endif()

-find_package(LibVterm REQUIRED)
+find_package(LIBVTERM 0.1 REQUIRED)
 include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})

 if(WIN32)
@@ -446,22 +454,6 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
  message(FATAL_ERROR "Sanitizers are only supported for Clang")
 endif()

-if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD|FreeBSD|Windows")  # see #5318
-  message(STATUS "skipping jemalloc on this system: ${CMAKE_SYSTEM_NAME}")
-  option(ENABLE_JEMALLOC "enable jemalloc" OFF)
-else()
-  option(ENABLE_JEMALLOC "enable jemalloc" ON)
-endif()
-
-if(ENABLE_JEMALLOC)
-  if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
-    message(STATUS "Sanitizers enabled; disabling jemalloc")
-  else()
-    find_package(JeMalloc REQUIRED)
-    include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
-  endif()
-endif()
-
 if(ENABLE_LIBINTL)
  # LibIntl (not Intl) selects our FindLibIntl.cmake script. #8464
  find_package(LibIntl REQUIRED)
@@ -524,6 +516,7 @@ if(NOT BUSTED_OUTPUT_TYPE)
 endif()

 find_program(LUACHECK_PRG luacheck)
+find_program(FLAKE8_PRG flake8)
 find_program(GPERF_PRG gperf)

 include(InstallHelpers)
@@ -535,27 +528,17 @@ install_helper(
  FILES ${MANPAGES}
  DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)

-# MIN_LOG_LEVEL for log.h
-if("${MIN_LOG_LEVEL}" MATCHES "^$")
-  message(STATUS "MIN_LOG_LEVEL not specified")
-else()
-  if(NOT MIN_LOG_LEVEL MATCHES "^[0-3]$")
-    message(FATAL_ERROR "invalid MIN_LOG_LEVEL: " ${MIN_LOG_LEVEL})
-  endif()
-  message(STATUS "MIN_LOG_LEVEL set to ${MIN_LOG_LEVEL}")
-endif()
-
+#
 # Go down the tree.
+#

 add_subdirectory(src/nvim)
-# Read compilation flags from src/nvim, used in config subdirectory below.
-include(GetCompileFlags)
-get_compile_flags(NVIM_VERSION_CFLAGS)
-
+get_directory_property(NVIM_VERSION_CFLAGS DIRECTORY src/nvim DEFINITION NVIM_VERSION_CFLAGS)
 add_subdirectory(test/includes)
 add_subdirectory(config)
 add_subdirectory(test/functional/fixtures)  # compile test programs
 add_subdirectory(runtime)
+get_directory_property(GENERATED_HELP_TAGS DIRECTORY runtime DEFINITION GENERATED_HELP_TAGS)
 if(WIN32)
  install_helper(
    FILES ${DEPS_PREFIX}/share/nvim-qt/runtime/plugin/nvim_gui_shim.vim
@@ -577,7 +560,7 @@ if(BUSTED_PRG)
  endif()

  set(UNITTEST_PREREQS nvim-test unittest-headers)
-  set(FUNCTIONALTEST_PREREQS nvim printargs-test shell-test)
+  set(FUNCTIONALTEST_PREREQS nvim printargs-test shell-test streams-test ${GENERATED_HELP_TAGS})
  if(NOT WIN32)
    list(APPEND FUNCTIONALTEST_PREREQS tty-test)
  endif()
@@ -605,7 +588,6 @@ if(BUSTED_PRG)
        -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
        -DBUILD_DIR=${CMAKE_BINARY_DIR}
        -DTEST_TYPE=unit
-        -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME}
        -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
      DEPENDS ${UNITTEST_PREREQS}
      ${TEST_TARGET_ARGS})
@@ -636,7 +618,6 @@ if(BUSTED_PRG)
      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
      -DBUILD_DIR=${CMAKE_BINARY_DIR}
      -DTEST_TYPE=functional
-      -DSYSTEM_NAME=${CMAKE_SYSTEM_NAME}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${FUNCTIONALTEST_PREREQS}
    ${TEST_TARGET_ARGS})
@@ -653,7 +634,6 @@ if(BUSTED_PRG)
      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
      -DBUILD_DIR=${CMAKE_BINARY_DIR}
      -DTEST_TYPE=benchmark
-      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${BENCHMARK_PREREQS}
    ${TEST_TARGET_ARGS})
@@ -671,7 +651,6 @@ if(BUSTED_LUA_PRG)
      -DTEST_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
      -DBUILD_DIR=${CMAKE_BINARY_DIR}
      -DTEST_TYPE=functional
-      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
      -P ${PROJECT_SOURCE_DIR}/cmake/RunTests.cmake
    DEPENDS ${FUNCTIONALTEST_PREREQS}
    ${TEST_TARGET_ARGS})
@@ -679,40 +658,12 @@ if(BUSTED_LUA_PRG)
 endif()

 if(LUACHECK_PRG)
-  add_custom_target(testlint
-    COMMAND ${CMAKE_COMMAND}
-      -DLUACHECK_PRG=${LUACHECK_PRG}
-      -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/test
-      -DIGNORE_PATTERN="*/preload.lua"
-      -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-      -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake)
-
-  add_custom_target(
-    lintbuiltinlua
-    COMMAND
-      ${CMAKE_COMMAND}
-        -DLUACHECK_PRG=${LUACHECK_PRG}
-        -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/src/nvim/lua
-        -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-        -DREAD_GLOBALS=vim
-        -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake
-  )
-  add_custom_target(
-    lintruntimelua
-    COMMAND
-      ${CMAKE_COMMAND}
-        -DLUACHECK_PRG=${LUACHECK_PRG}
-        -DLUAFILES_DIR=${CMAKE_CURRENT_SOURCE_DIR}/runtime/lua
-        -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}
-        -DREAD_GLOBALS=vim
-        -P ${PROJECT_SOURCE_DIR}/cmake/RunLuacheck.cmake
-  )
-  # TODO(ZyX-I): Run linter for all lua code in src
-  add_custom_target(
-    lualint
-    DEPENDS lintruntimelua
-    DEPENDS lintbuiltinlua
-  )
+  add_custom_target(lualint
+    COMMAND ${LUACHECK_PRG} -q runtime/ src/ test/
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+else()
+  add_custom_target(lualint false
+    COMMENT "lualint: LUACHECK_PRG not defined")
 endif()

 set(CPACK_PACKAGE_NAME "Neovim")
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,5 @@
-# Contributing to Neovim
+Contributing to Neovim
+======================

 Getting started
 ---------------
@@ -8,13 +9,25 @@ low-risk/isolated tasks:

 - [Merge a Vim patch].
 - Try a [complexity:low] issue.
- Fix bugs found by [clang scan-build](#clang-scan-build),
-  [coverity](#coverity), and [PVS](#pvs-studio).
+- Fix bugs found by [Clang](#clang-scan-build), [PVS](#pvs-studio) or
+  [Coverity](#coverity).
+
+Reporting problems
+------------------
+
+- [Check the FAQ][wiki-faq].
+- [Search existing issues][github-issues] (including closed!)
+- Update Neovim to the latest version to see if your problem persists.
+- Disable plugins incrementally, to narrow down the cause of the issue.
+- When reporting a crash, [include a stacktrace](https://github.com/neovim/neovim/wiki/FAQ#backtrace-linux).
+- [Bisect][git-bisect] to the cause of a regression, if you are able. This is _extremely_ helpful.
+- Check `$NVIM_LOG_FILE`, if it exists.
+- Include `cmake --system-information` for build-related issues.

 Developer guidelines
 --------------------

- Nvim contributors should read `:help dev` (especially `:help dev-api`).
+- Nvim contributors should read `:help dev`.
 - External UI developers should read `:help dev-ui`.
 - API client developers should read `:help dev-api-client`.
 - Nvim developers are _strongly encouraged_ to install `ninja` for faster builds.
@@ -24,22 +37,11 @@ Developer guidelines
  make  # Nvim build system uses ninja automatically, if available.
  ```

-Reporting problems
------------------
-
- Check the [**FAQ**][wiki-faq].
- Search [existing issues][github-issues] (including closed!)
- Update Neovim to the latest version to see if your problem persists.
- Disable plugins incrementally, to narrow down the cause of the issue.
- When reporting a crash, [include a stacktrace](https://github.com/neovim/neovim/wiki/Development-tips#backtrace-linux).
- [Bisect][git-bisect] to the cause of a regression, if you are able. This is _extremely_ helpful.
- Check `$NVIM_LOG_FILE`, if it exists.
- Include `cmake --system-information` for **build** issues.
-
-Pull requests ("PRs")
+Pull requests (PRs)
 ---------------------

 - To avoid duplicate work, create a `[WIP]` pull request as soon as possible.
+- Your PR must include **test coverage.** See [test/README.md][run-tests].
 - Avoid cosmetic changes to unrelated files in the same commit.
 - Use a [feature branch][git-feature-branch] instead of the master branch.
 - Use a **rebase workflow** for small PRs.
@@ -63,20 +65,10 @@ Pull requests ("PRs")
 Pull requests have three stages: `[WIP]` (Work In Progress), `[RFC]` (Request
 For Comment) and `[RDY]` (Ready).

- Untagged PRs are assumed to be `[RFC]`, i.e. you are requesting a review.
- Prepend `[WIP]` to the PR title if you are _not_ requesting feedback and the
-  work is still in flux.
- Prepend `[RDY]` to the PR title if you are _done_ with the PR and are only
-  waiting on it to be merged.
-
-For example, a typical workflow is:
-
-1. You open a `[WIP]` PR where the work is _not_ ready for feedback, you just want to
-   let others know what you are doing.
-2. Once the PR is ready for review, you replace `[WIP]` in the title with `[RFC]`.
-   You may add fix up commits to address issues that come up during review.
-3. Once the PR is ready for merging, you rebase/squash your work appropriately and
-   then replace `[RFC]` in the title with `[RDY]`.
+- `[RFC]` is assumed by default, i.e. you are requesting a review.
+- Add `[WIP]` to the PR title if you are _not_ requesting feedback and the work
+  is still in flux.
+- Add `[RDY]` if you are _done_ and only waiting on merge.

 ### Commit messages

@@ -86,14 +78,14 @@ the VCS/git logs more valuable.
 - Try to keep the first line under 72 characters.
 - **Prefix the commit subject with a _scope_:** `doc:`, `test:`, `foo.c:`,
  `runtime:`, ...
-    - For commits that contain only style/lint changes, a single-word subject
-      line is preferred: `style` or `lint`.
+    - Subject line for commits with only style/lint changes can be a single
+      word: `style` or `lint`.
 - A blank line must separate the subject from the description.
 - Use the _imperative voice_: "Fix bug" rather than "Fixed bug" or "Fixes bug."

 ### Automated builds (CI)

-Each pull request must pass the automated builds on [travis CI], [quickbuild]
+Each pull request must pass the automated builds on [Travis CI], [QuickBuild]
 and [AppVeyor].

 - CI builds are compiled with [`-Werror`][gcc-warnings], so compiler warnings
@@ -105,47 +97,98 @@ and [AppVeyor].
 - CI runs [ASan] and other analyzers.
    - To run valgrind locally: `VALGRIND=1 make test`
    - To run Clang ASan/UBSan locally: `CC=clang make CMAKE_FLAGS="-DCLANG_ASAN_UBSAN=ON"`
- The `lint` build ([#3174][3174]) checks modified lines _and their immediate
-  neighbors_. This is to encourage incrementally updating the legacy style to
-  meet our style guidelines.
-    - A single word (`lint` or `style`) is sufficient as the subject line of
-      a commit that contains only style changes.
+- The [lint](#lint) build checks modified lines _and their immediate
+  neighbors_, to encourage incrementally updating the legacy style to meet our
+  [style](#style). (See [#3174][3174] for background.)
 - [How to investigate QuickBuild failures](https://github.com/neovim/neovim/pull/4718#issuecomment-217631350)
-
-QuickBuild uses this invocation:
-
+    - QuickBuild uses this invocation:
+      ```
      mkdir -p build/${params.get("buildType")} \
      && cd build/${params.get("buildType")} \
      && cmake -G "Unix Makefiles" -DBUSTED_OUTPUT_TYPE=TAP -DCMAKE_BUILD_TYPE=${params.get("buildType")}
      -DTRAVIS_CI_BUILD=ON ../.. && ${node.getAttribute("make", "make")}
      VERBOSE=1 nvim unittest-prereqs functionaltest-prereqs
-
+      ```

 ### Clang scan-build

-The auto-generated [clang-scan] report presents walk-throughs of bugs found by
-Clang's [scan-build](https://clang-analyzer.llvm.org/scan-build.html) static
-analyzer. To verify a fix locally, run `scan-build` like this:
+View the [Clang report] to see potential bugs found by the Clang
+[scan-build](https://clang-analyzer.llvm.org/scan-build.html) analyzer.

+- Search the Neovim commit history to find examples:
+  ```
+  git log --oneline --no-merges --grep clang
+  ```
+- To verify a fix locally, run `scan-build` like this:
+  ```
  rm -rf build/
  scan-build --use-analyzer=/usr/bin/clang make
+  ```
+
+### PVS-Studio
+
+View the [PVS report](https://neovim.io/doc/reports/pvs/PVS-studio.html.d/) to
+see potential bugs found by [PVS Studio](https://www.viva64.com/en/pvs-studio/).
+
+- Use this format for commit messages (where `{id}` is the PVS warning-id)):
+  ```
+  PVS/V{id}: {description}
+  ```
+- Search the Neovim commit history to find examples:
+  ```
+  git log --oneline --no-merges --grep PVS
+  ```
+- Try `./scripts/pvscheck.sh` to run PVS locally.

 ### Coverity

 [Coverity](https://scan.coverity.com/projects/neovim-neovim) runs against the
 master build. To view the defects, just request access; you will be approved.

-Use this commit-message format for coverity fixes:
+- Use this format for commit messages (where `{id}` is the CID (Coverity ID);
+  ([example](https://github.com/neovim/neovim/pull/804))):
+  ```
+  coverity/{id}: {description}
+  ```
+- Search the Neovim commit history to find examples:
+  ```
+  git log --oneline --no-merges --grep coverity
+  ```

-    coverity/<id>: <description of what fixed the defect>

-where `<id>` is the Coverity ID (CID). For example see [#804](https://github.com/neovim/neovim/pull/804).
+Coding
+------

-### PVS-Studio
+### Lint
+
+You can run the linter locally by:
+
+    make lint
+
+The lint step downloads the [master error list] and excludes them, so only lint
+errors related to the local changes are reported.
+
+You can lint a single file (but this will _not_ exclude legacy errors):
+
+    ./src/clint.py src/nvim/ops.c
+
+### Style
+
+The repo includes a `.clang-format` config file which (mostly) matches the
+[style-guide].  You can use `clang-format` to format code with the `gq`
+operator in Nvim:
+
+    if !empty(findfile('.clang-format', ';'))
+      setlocal formatprg=clang-format\ -style=file
+    endif
+
+### Navigate
+
+- Use **[universal-ctags](https://github.com/universal-ctags/ctags).**
+  ("Exuberant ctags", the typical `ctags` binary provided by your distro, is
+  unmaintained and won't recognize many function signatures in Neovim source.)
+- Explore the source code [on the web](https://sourcegraph.com/github.com/neovim/neovim).

-View the [PVS analysis report](https://neovim.io/doc/reports/pvs/) to see bugs
-found by [PVS Studio](https://www.viva64.com/en/pvs-studio/).
-You can run `scripts/pvscheck.sh` locally to run PVS on your machine.

 Reviewing
 ---------
@@ -179,9 +222,10 @@ as context, use the `-W` argument as well.
 [wiki-faq]: https://github.com/neovim/neovim/wiki/FAQ
 [review-checklist]: https://github.com/neovim/neovim/wiki/Code-review-checklist
 [3174]: https://github.com/neovim/neovim/issues/3174
-[travis CI]: https://travis-ci.org/neovim/neovim
-[quickbuild]: http://neovim-qb.szakmeister.net/dashboard
+[Travis CI]: https://travis-ci.org/neovim/neovim
+[QuickBuild]: http://neovim-qb.szakmeister.net/dashboard
 [AppVeyor]: https://ci.appveyor.com/project/neovim/neovim
 [Merge a Vim patch]: https://github.com/neovim/neovim/wiki/Merging-patches-from-upstream-Vim
-[clang-scan]: https://neovim.io/doc/reports/clang/
+[Clang report]: https://neovim.io/doc/reports/clang/
 [complexity:low]: https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow
+[master error list]: https://raw.githubusercontent.com/neovim/doc/gh-pages/reports/clint/errors.json
--- a/MAINTAIN.md
+++ b/MAINTAIN.md
@@ -3,9 +3,16 @@ Maintaining the Neovim project

 Notes on maintaining the Neovim project.

-See also: https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt
+General guidelines
+------------------

-Ticket Triage
+* Decide by cost-benefit
+* Write down what was decided
+* Constraints are good
+* Use automation to solve problems
+* Never break the API
+
+Ticket triage
 -------------

 In practice we haven't found a meaningful way to forecast more precisely than
@@ -19,9 +26,9 @@ The forecasting problem might be solved with an explicit priority system (like
 Bram's todo.txt). Meanwhile the Neovim priority system is defined by:

 - PRs nearing completion (RDY).
- Issue labels. E.g. the +plan label increases the ticket's priority merely for
-  having a plan written down: it is _closer to completion_ than tickets without
-  a plan.
+- Issue labels. E.g. the `+plan` label increases the ticket's priority merely
+  for having a plan written down: it is _closer to completion_ than tickets
+  without a plan.
 - Comment activity or new information.

 Anything that isn't in the next milestone, and doesn't have a RDY PR ... is
@@ -29,20 +36,28 @@ just not something you care very much about, by construction. Post-release you
 can review open issues, but chances are your next milestone is already getting
 full :)

-Release Policy
+Release policy
 --------------

-The goal is "early and often".
+Release "often", but not "early".

-Up to now we use only one branch, the `master` branch.
+The (unreleased) `master` branch is the "early" channel; it should not be
+released if it's not stable. High-risk changes may be merged to `master` if
+the next release is not imminent.
+
+For maintenance releases, create a `release-x.y` branch. If the current release
+has a major bug:

- If `master` is unstable we don't release.
- If the last release has a major bug, we:
 1. Fix the bug on `master`.
-  2. Disable or remove any known risks present on `master`.
-  3. Cut a release from `master`.
+2. Cherry-pick the fix to `release-x.y`.
+3. Cut a release from `release-x.y`.
+    - Run `./scripts/release.sh`
+    - Update (force-push) the remote `stable` tag.
+    - The [nightly job](https://github.com/neovim/bot-ci/blob/master/ci/nightly.sh)
+      will update the release assets based on the `stable` tag.

-This is a bit silly, but it works ok. And it keeps `master` from biting off
-more feature-creep than it can chew.
+See also
+--------

-See also: https://github.com/neovim/neovim/issues/862
+- https://github.com/neovim/neovim/issues/862
+- https://github.com/git/git/blob/master/Documentation/howto/maintain-git.txt
--- a/87
+++ b/87
@@ -5,15 +5,39 @@ filter-true = $(strip $(filter-out 1 on ON true TRUE,$1))
 # See contrib/local.mk.example
 -include local.mk

+all: nvim
+
 CMAKE_PRG ?= $(shell (command -v cmake3 || echo cmake))
 CMAKE_BUILD_TYPE ?= Debug
-
 CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE)
+# Extra CMake flags which extend the default set
+CMAKE_EXTRA_FLAGS ?=
+
+# CMAKE_INSTALL_PREFIX
+#   - May be passed directly or as part of CMAKE_EXTRA_FLAGS.
+#   - `checkprefix` target checks that it matches the CMake-cached value. #9615
+ifneq (,$(CMAKE_INSTALL_PREFIX)$(CMAKE_EXTRA_FLAGS))
+CMAKE_INSTALL_PREFIX := $(shell echo $(CMAKE_EXTRA_FLAGS) | 2>/dev/null \
+    grep -o 'CMAKE_INSTALL_PREFIX=[^ ]\+' | cut -d '=' -f2)
+endif
+ifneq (,$(CMAKE_INSTALL_PREFIX))
+override CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX)
+
+checkprefix:
+	@if [ -f build/.ran-cmake ]; then \
+	  cached_prefix=$(shell $(CMAKE_PRG) -L -N build | 2>/dev/null grep 'CMAKE_INSTALL_PREFIX' | cut -d '=' -f2); \
+	  if ! [ "$(CMAKE_INSTALL_PREFIX)" = "$$cached_prefix" ]; then \
+	    printf "Re-running CMake: CMAKE_INSTALL_PREFIX '$(CMAKE_INSTALL_PREFIX)' does not match cached value '%s'.\n" "$$cached_prefix"; \
+	    $(RM) build/.ran-cmake; \
+	  fi \
+	fi
+else
+checkprefix: ;
+endif

 BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \
    echo "Unix Makefiles")
 DEPS_BUILD_DIR ?= .deps
-
 ifneq (1,$(words [$(DEPS_BUILD_DIR)]))
  $(error DEPS_BUILD_DIR must not contain whitespace)
 endif
@@ -32,17 +56,15 @@ ifeq (,$(BUILD_TOOL))
  endif
 endif

+BUILD_CMD = $(BUILD_TOOL)
+
 ifneq ($(VERBOSE),)
  # Only need to handle Ninja here.  Make will inherit the VERBOSE variable.
  ifeq ($(BUILD_TYPE),Ninja)
-    VERBOSE_FLAG := -v
+    BUILD_CMD += -v
  endif
 endif

-BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
-
-# Extra CMake flags which extend the default set
-CMAKE_EXTRA_FLAGS ?=
 DEPS_CMAKE_FLAGS ?=
 # Back-compat: USE_BUNDLED_DEPS was the old name.
 USE_BUNDLED ?= $(USE_BUNDLED_DEPS)
@@ -60,8 +82,6 @@ endif
 # a warning, but we need to keep SCRIPTS argument.
 SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE)

-all: nvim
-
 nvim: build/.ran-cmake deps
 	+$(BUILD_CMD) -C build

@@ -81,18 +101,20 @@ ifeq ($(call filter-true,$(USE_BUNDLED)),)
 	+$(BUILD_CMD) -C $(DEPS_BUILD_DIR)
 endif

-build/.ran-third-party-cmake:
 ifeq ($(call filter-true,$(USE_BUNDLED)),)
-	mkdir -p $(DEPS_BUILD_DIR)
+$(DEPS_BUILD_DIR):
+	mkdir -p "$@"
+build/.ran-third-party-cmake:: $(DEPS_BUILD_DIR)
 	cd $(DEPS_BUILD_DIR) && \
 		$(CMAKE_PRG) -G '$(BUILD_TYPE)' $(BUNDLED_CMAKE_FLAG) $(BUNDLED_LUA_CMAKE_FLAG) \
 		$(DEPS_CMAKE_FLAGS) $(THIS_DIR)/third-party
 endif
+build/.ran-third-party-cmake::
 	mkdir -p build
 	touch $@

 # TODO: cmake 3.2+ add_custom_target() has a USES_TERMINAL flag.
-oldtest: | nvim helptags
+oldtest: | nvim build/runtime/doc/tags
 	+$(SINGLE_MAKE) -C src/nvim/testdir clean
 ifeq ($(strip $(TEST_FILE)),)
 	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" $(MAKEOVERRIDES)
@@ -100,11 +122,11 @@ else
 	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG="$(realpath build/bin/nvim)" NEW_TESTS=$(TEST_FILE) SCRIPTS= $(MAKEOVERRIDES)
 endif

-helptags: | nvim
-	+$(BUILD_CMD) -C build helptags
+build/runtime/doc/tags helptags: | nvim
+	+$(BUILD_CMD) -C build runtime/doc/tags

 # Builds help HTML _and_ checks for invalid help tags.
-helphtml: | nvim helptags
+helphtml: | nvim build/runtime/doc/tags
 	+$(BUILD_CMD) -C build doc_html

 functionaltest: | nvim
@@ -113,12 +135,17 @@ functionaltest: | nvim
 functionaltest-lua: | nvim
 	+$(BUILD_CMD) -C build functionaltest-lua

-testlint: | build/.ran-cmake deps
-	$(BUILD_CMD) -C build testlint
-
 lualint: | build/.ran-cmake deps
 	$(BUILD_CMD) -C build lualint

+pylint:
+	flake8 contrib/ scripts/ src/ test/
+
+# Run pylint only if flake8 is installed.
+_opt_pylint:
+	@command -v flake8 && { $(MAKE) pylint; exit $$?; } \
+		|| echo "SKIP: pylint (flake8 not found)"
+
 unittest: | nvim
 	+$(BUILD_CMD) -C build unittest

@@ -132,10 +159,11 @@ clean:
 	$(MAKE) -C src/nvim/testdir clean
 	$(MAKE) -C runtime/doc clean

-distclean: clean
+distclean:
 	rm -rf $(DEPS_BUILD_DIR) build
+	$(MAKE) clean

-install: | nvim
+install: checkprefix nvim
 	+$(BUILD_CMD) -C build install

 clint: build/.ran-cmake
@@ -153,11 +181,22 @@ generated-sources: build/.ran-cmake
 appimage:
 	bash scripts/genappimage.sh

-# Build an appimage with embedded update information appimage-nightly for
-# nightly builds or appimage-latest for a release
+# Build an appimage with embedded update information.
+#   appimage-nightly: for nightly builds
+#   appimage-latest: for a release
 appimage-%:
 	bash scripts/genappimage.sh $*

-lint: check-single-includes clint testlint lualint
+lint: check-single-includes clint lualint _opt_pylint

-.PHONY: test testlint lualint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage
+# Generic pattern rules, allowing for `make build/bin/nvim` etc.
+# Does not work with "Unix Makefiles".
+ifeq ($(BUILD_TYPE),Ninja)
+build/%:
+	$(BUILD_CMD) -C build $(patsubst build/%,%,$@)
+
+$(DEPS_BUILD_DIR)/%:
+	$(BUILD_CMD) -C $(DEPS_BUILD_DIR) $(patsubst $(DEPS_BUILD_DIR)/%,%,$@)
+endif
+
+.PHONY: test lualint pylint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage checkprefix
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
-[![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-600x173.png)](https://neovim.io)
+[![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo-300x87.png)](https://neovim.io)

 [Wiki](https://github.com/neovim/neovim/wiki) |
 [Documentation](https://neovim.io/doc) |
-[Twitter](https://twitter.com/Neovim) |
-[Community](https://neovim.io/community/) |
-[Gitter **Chat**](https://gitter.im/neovim/neovim)
+[Chat/Discussion](https://gitter.im/neovim/neovim) |
+[Twitter](https://twitter.com/Neovim)

 [![Travis build status](https://travis-ci.org/neovim/neovim.svg?branch=master)](https://travis-ci.org/neovim/neovim)
 [![AppVeyor build status](https://ci.appveyor.com/api/projects/status/urdqjrik5u521fac/branch/master?svg=true)](https://ci.appveyor.com/project/neovim/neovim/branch/master)
@@ -27,15 +26,13 @@ Neovim is a project that seeks to aggressively refactor Vim in order to:
 See the [Introduction](https://github.com/neovim/neovim/wiki/Introduction) wiki page and [Roadmap]
 for more information.

-[![Throughput Graph](https://graphs.waffle.io/neovim/neovim/throughput.svg)](https://waffle.io/neovim/neovim/metrics)
-
 Features
 --------

 - Modern [GUIs](https://github.com/neovim/neovim/wiki/Related-projects#gui)
- [API](https://github.com/neovim/neovim/wiki/Related-projects#api-clients)
-  access from any language including Clojure, Lisp, Go, Haskell, Lua,
-  JavaScript, Perl, Python, Ruby, and Rust
+- [API access](https://github.com/neovim/neovim/wiki/Related-projects#api-clients)
+  from any language including C/C++, C#, Clojure, D, Elixir, Go, Haskell, Java,
+  JavaScript/Node.js, Julia, Lisp, Lua, Perl, Python, Racket, Ruby, Rust
 - Embedded, scriptable [terminal emulator](https://neovim.io/doc/user/nvim_terminal_emulator.html)
 - Asynchronous [job control](https://github.com/neovim/neovim/pull/2247)
 - [Shared data (shada)](https://github.com/neovim/neovim/pull/2506) among multiple editor instances
@@ -50,25 +47,27 @@ Install from package
 Pre-built packages for Windows, macOS, and Linux are found on the
 [Releases](https://github.com/neovim/neovim/releases/) page.

-Managed packages are in [Homebrew], [Debian], [Ubuntu], [Fedora], [Arch Linux], [Gentoo],
-and [more](https://github.com/neovim/neovim/wiki/Installing-Neovim)!
+[Managed packages] are in Homebrew, [Debian], [Ubuntu], [Fedora], [Arch Linux],
+[Gentoo], and more!

 Install from source
 -------------------

+The build is CMake-based, but a Makefile is provided as a convenience.
+
    make CMAKE_BUILD_TYPE=RelWithDebInfo
    sudo make install

-To install to a non-default location, set `CMAKE_INSTALL_PREFIX`:
+To install to a non-default location:

-    make CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=/full/path/"
+    make CMAKE_INSTALL_PREFIX=/full/path/
    make install

 To skip bundled (`third-party/*`) dependencies:

 1. Install the dependencies using a package manager.
   ```
-   sudo apt install gperf luajit luarocks libuv1-dev libluajit-5.1-dev libunibilium-dev libmsgpack-dev libtermkey-dev libvterm-dev libjemalloc-dev
+   sudo apt install gperf luajit luarocks libuv1-dev libluajit-5.1-dev libunibilium-dev libmsgpack-dev libtermkey-dev libvterm-dev
   sudo luarocks build mpack
   sudo luarocks build lpeg
   sudo luarocks build inspect
@@ -79,17 +78,10 @@ To skip bundled (`third-party/*`) dependencies:
   sudo make install
   ```

-CMake features:
+To inspect the build, these CMake features are useful:

- List all build targets:
-  ```
-  cmake --build build --target help
-  ```
- Print all variable definitions:
-  ```
-  cmake -LAH
-  ```
- `build/CMakeCache.txt` contains the resolved values of all CMake variables.
+- `cmake --build build --target help` lists all build targets.
+- `build/CMakeCache.txt` (or `cmake -LAH build/`) contains the resolved values of all CMake variables.
 - `build/compile_commands.json` shows the full compiler invocations for each translation unit.

 See the [Building Neovim](https://github.com/neovim/neovim/wiki/Building-Neovim) wiki page for details.
@@ -148,7 +140,7 @@ See `LICENSE` for details.
 [nvim-features]: https://neovim.io/doc/user/vim_diff.html#nvim-features
 [Roadmap]: https://neovim.io/roadmap/
 [advanced UIs]: https://github.com/neovim/neovim/wiki/Related-projects#gui
-[Homebrew]: https://github.com/neovim/homebrew-neovim#installation
+[Managed packages]: https://github.com/neovim/neovim/wiki/Installing-Neovim#install-from-package
 [Debian]: https://packages.debian.org/testing/neovim
 [Ubuntu]: http://packages.ubuntu.com/search?keywords=neovim
 [Fedora]: https://apps.fedoraproject.org/packages/neovim
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,25 +1,45 @@
 version: '{build}'
 environment:
  APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
+  DEPS_BUILD_DIR: "C:/projects/nvim-deps"
+  DEPS_PREFIX: "C:/projects/nvim-deps/usr"
+  # Silence/redirect errors due to missing locking support (via libgcov).
+  GCOV_ERROR_FILE: "$(TEMP)/libgcov-errors.log"
 image: Visual Studio 2017
 configuration:
+- MINGW_64-gcov
+- MINGW_32
 - MSVC_64
 - MSVC_32
- MINGW_64
- MINGW_32
- MINGW_64-gcov
+init:
+- ps: |
+    # Pull requests: skip some build configurations to save time.
+    if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32)$') {
+      $env:APPVEYOR_CACHE_SKIP_SAVE = "true"
+      Exit-AppVeyorBuild
+    }
+# RDP
+#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 matrix:
-  allow_failures:
-    - configuration: MINGW_64-gcov
+  fast_finish: true
 install: []
 before_build:
 - ps: Install-Product node 8
 build_script:
 - powershell ci\build.ps1
+after_build:
+- ps: |
+    if (Test-Path $env:GCOV_ERROR_FILE) {
+      Get-Content $env:GCOV_ERROR_FILE -Head 10
+      Get-Content $env:GCOV_ERROR_FILE -Tail 10
+    } else {
+      write-host "no GCOV_ERROR_FILE"
+    }
 cache:
- C:\msys64\var\cache\pacman\pkg -> ci\build.ps1
- .deps -> ci\build.ps1
- .deps -> third-party\**
+- C:\projects\nvim-deps -> third-party\**
 artifacts:
 - path: build/Neovim.zip
 - path: build/bin/nvim.exe
+branches:
+  only:
+    - master
--- a/busted/outputHandlers/TAP.lua
+++ b/busted/outputHandlers/TAP.lua
@@ -1,94 +0,0 @@
-- TODO(jkeyes): Use the upstream version when busted releases it. (But how to
-- inject our call to global_helpers.read_nvim_log() ?)
-
-local pretty = require 'pl.pretty'
-local global_helpers = require('test.helpers')
-
-return function(options)
-  local busted = require 'busted'
-  local handler = require 'busted.outputHandlers.base'()
-
-  local success = 'ok %u - %s'
-  local failure = 'not ' .. success
-  local skip = 'ok %u - # SKIP %s'
-  local counter = 0
-
-  handler.suiteReset = function()
-    counter = 0
-    return nil, true
-  end
-
-  handler.suiteEnd = function()
-    io.write(global_helpers.read_nvim_log())
-    print('1..' .. counter)
-    io.flush()
-    return nil, true
-  end
-
-  local function showFailure(t)
-    local message = t.message
-    local trace = t.trace or {}
-
-    if message == nil then
-      message = 'Nil error'
-    elseif type(message) ~= 'string' then
-      message = pretty.write(message)
-    end
-
-    print(failure:format(counter, t.name))
-    print('# ' .. t.element.trace.short_src .. ' @ ' .. t.element.trace.currentline)
-    if t.randomseed then print('# Random seed: ' .. t.randomseed) end
-    print('# Failure message: ' .. message:gsub('\n', '\n# '))
-    if options.verbose and trace.traceback then
-      print('# ' .. trace.traceback:gsub('^\n', '', 1):gsub('\n', '\n# '))
-    end
-  end
-
-  handler.testStart = function(element, parent)
-    local trace = element.trace
-    if options.verbose and trace and trace.short_src then
-      local fileline = trace.short_src .. ' @ ' ..  trace.currentline .. ': '
-      local testName = fileline .. handler.getFullName(element)
-      print('# ' .. testName)
-    end
-    io.flush()
-
-    return nil, true
-  end
-
-  handler.testEnd = function(element, parent, status, trace)
-    counter = counter + 1
-    if status == 'success' then
-      local t = handler.successes[#handler.successes]
-      print(success:format(counter, t.name))
-    elseif status == 'pending' then
-      local t = handler.pendings[#handler.pendings]
-      print(skip:format(counter, (t.message or t.name)))
-    elseif status == 'failure' then
-      showFailure(handler.failures[#handler.failures])
-    elseif status == 'error' then
-      showFailure(handler.errors[#handler.errors])
-    end
-    io.flush()
-
-    return nil, true
-  end
-
-  handler.error = function(element, parent, message, debug)
-    if element.descriptor ~= 'it' then
-      counter = counter + 1
-      showFailure(handler.errors[#handler.errors])
-    end
-    io.flush()
-
-    return nil, true
-  end
-
-  busted.subscribe({ 'suite', 'reset' }, handler.suiteReset)
-  busted.subscribe({ 'suite', 'end' }, handler.suiteEnd)
-  busted.subscribe({ 'test', 'start' }, handler.testStart, { predicate = handler.cancelOnPending })
-  busted.subscribe({ 'test', 'end' }, handler.testEnd, { predicate = handler.cancelOnPending })
-  busted.subscribe({ 'error' }, handler.error)
-
-  return handler
-end
--- a/ci/before_cache.sh
+++ b/ci/before_cache.sh
@@ -7,23 +7,20 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"

-# Don't cache pip's log and selfcheck.
-rm -rf "${HOME}/.cache/pip/log"
-rm -f "${HOME}/.cache/pip/selfcheck.json"
-
 echo "before_cache.sh: cache size"
-du -d 2 "${HOME}/.cache" | sort -n
+du -chd 1 "${HOME}/.cache" | sort -rh | head -20

 echo "before_cache.sh: ccache stats"
 ccache -s 2>/dev/null || true
+# Do not keep ccache stats (uploaded to cache otherwise; reset initially anyway).
+find "${HOME}/.ccache" -name stats -delete

 # Update the third-party dependency cache only if the build was successful.
 if ended_successfully; then
-  rm -rf "${HOME}/.cache/nvim-deps"
-  mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
-
-  rm -rf "${HOME}/.cache/nvim-deps-downloads"
-  mv "${DEPS_DOWNLOAD_DIR}" "${HOME}/.cache/nvim-deps-downloads"
+  # Do not cache downloads.  They should not be needed with up-to-date deps.
+  rm -rf "${DEPS_BUILD_DIR}/build/downloads"
+  rm -rf "${CACHE_NVIM_DEPS_DIR}"
+  mv "${DEPS_BUILD_DIR}" "${CACHE_NVIM_DEPS_DIR}"

  touch "${CACHE_MARKER}"
  echo "Updated third-party dependencies (timestamp: $(_stat "${CACHE_MARKER}"))."
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -7,28 +7,37 @@ if [[ "${CI_TARGET}" == lint ]]; then
  exit
 fi

-echo 'python info:'
+echo 'Python info:'
 (
-  2>&1 python --version || true
-  2>&1 python2 --version || true
-  2>&1 python3 --version || true
-  2>&1 pip --version || true
-  2>&1 pip2 --version || true
-  2>&1 pip3 --version || true
-  echo 'pyenv versions:'
-  2>&1 pyenv versions || true
-) | sed 's/^/  /'
+  set -x
+  python3 --version
+  python2 --version
+  python --version
+  pip3 --version
+  pip2 --version
+  pip --version

-if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  echo "Upgrade Python 3 pip"
-  python3 -m pip -q install --user --upgrade pip
-else
-  echo "Upgrade Python 2 pip"
-  python2.7 -m pip -q install --user --upgrade pip
-  echo "Upgrade Python 3 pip"
-  # Allow failure. pyenv pip3 on travis is broken:
-  # https://github.com/travis-ci/travis-ci/issues/8363
-  python3 -m pip -q install --user --upgrade pip || true
+  pyenv --version
+  pyenv versions
+) 2>&1 | sed 's/^/  /' || true
+
+# Use pyenv, but not for OSX on Travis, where it only has the "system" version.
+if [[ "${TRAVIS_OS_NAME}" != osx ]] && command -v pyenv; then
+  echo 'Setting Python versions via pyenv'
+
+  # Prefer Python 2 over 3 (more conservative).
+  pyenv global 2.7.15:3.7
+
+  echo 'Updated Python info:'
+  (
+    set -x
+    python3 --version
+    python2 --version
+    python --version
+
+    python3 -m pip --version
+    python2 -m pip --version
+  ) 2>&1 | sed 's/^/  /'
 fi

 echo "Install node (LTS)"
@@ -40,3 +49,16 @@ fi
 source ~/.nvm/nvm.sh
 nvm install --lts
 nvm use --lts
+
+if [[ -n "$CMAKE_URL" ]]; then
+  echo "Installing custom CMake: $CMAKE_URL"
+  curl --retry 5 --silent --fail -o /tmp/cmake-installer.sh "$CMAKE_URL"
+  mkdir -p "$HOME/.local/bin" /opt/cmake-custom
+  bash /tmp/cmake-installer.sh --prefix=/opt/cmake-custom --skip-license
+  ln -sfn /opt/cmake-custom/bin/cmake "$HOME/.local/bin/cmake"
+  cmake_version="$(cmake --version)"
+  echo "$cmake_version" | grep -qF '2.8.12' || {
+    echo "Unexpected CMake version: $cmake_version"
+    exit 1
+  }
+fi
--- a/ci/before_script.sh
+++ b/ci/before_script.sh
@@ -20,8 +20,10 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
  exit 1
 fi

-# Show ccache stats so we can compare in before_cache
-ccache -s 2>/dev/null || true
+echo "before_script.sh: ccache stats (will be cleared)"
+ccache -s
+# Reset ccache stats for real results in before_cache.
+ccache --zero-stats

 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
  # Adds user to a dummy group.
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -1,25 +1,26 @@
 $ErrorActionPreference = 'stop'
 Set-PSDebug -Strict -Trace 1

+$isPullRequest = ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -ne $null)
 $env:CONFIGURATION -match '^(?<compiler>\w+)_(?<bits>32|64)(?:-(?<option>\w+))?$'
 $compiler = $Matches.compiler
 $compileOption = $Matches.option
 $bits = $Matches.bits
-$cmakeBuildType = 'RelWithDebInfo'
+$cmakeBuildType = $(if ($env:CMAKE_BUILD_TYPE -ne $null) {$env:CMAKE_BUILD_TYPE} else {'RelWithDebInfo'});
+$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
 $depsCmakeVars = @{
  CMAKE_BUILD_TYPE = $cmakeBuildType;
 }
 $nvimCmakeVars = @{
  CMAKE_BUILD_TYPE = $cmakeBuildType;
  BUSTED_OUTPUT_TYPE = 'nvim';
+  DEPS_PREFIX=$(if ($env:DEPS_PREFIX -ne $null) {$env:DEPS_PREFIX} else {".deps/usr"});
+}
+if ($env:DEPS_BUILD_DIR -eq $null) {
+  $env:DEPS_BUILD_DIR = ".deps";
 }
 $uploadToCodeCov = $false

-# For pull requests, skip some build configurations to save time.
-if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and $env:CONFIGURATION -match '^(MSVC_64|MINGW_32|MINGW_64-gcov)$') {
-  exit 0
-}
-
 function exitIfFailed() {
  if ($LastExitCode -ne 0) {
    Set-PSDebug -Off
@@ -27,6 +28,13 @@ function exitIfFailed() {
  }
 }

+if (-Not (Test-Path -PathType container $env:DEPS_BUILD_DIR)) {
+  write-host "cache dir not found: $($env:DEPS_BUILD_DIR)"
+  mkdir $env:DEPS_BUILD_DIR
+} else {
+  write-host "cache dir $($env:DEPS_BUILD_DIR) size: $(Get-ChildItem $env:DEPS_BUILD_DIR -recurse | Measure-Object -property length -sum | Select -expand sum)"
+}
+
 if ($compiler -eq 'MINGW') {
  if ($bits -eq 32) {
    $arch = 'i686'
@@ -37,13 +45,14 @@ if ($compiler -eq 'MINGW') {
  if ($compileOption -eq 'gcov') {
    $nvimCmakeVars['USE_GCOV'] = 'ON'
    $uploadToCodecov = $true
+    $env:GCOV = "C:\msys64\mingw$bits\bin\gcov"
  }
  # These are native MinGW builds, but they use the toolchain inside
  # MSYS2, this allows using all the dependencies and tools available
  # in MSYS2, but we cannot build inside the MSYS2 shell.
  $cmakeGenerator = 'Ninja'
  $cmakeGeneratorArgs = '-v'
-  $mingwPackages = @('ninja', 'cmake', 'perl', 'diffutils', 'unibilium').ForEach({
+  $mingwPackages = @('ninja', 'cmake', 'perl', 'diffutils').ForEach({
    "mingw-w64-$arch-$_"
  })

@@ -89,20 +98,20 @@ function convertToCmakeArgs($vars) {
  return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }

-if (-Not (Test-Path -PathType container .deps)) {
-  mkdir .deps
-}
-cd .deps
-cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) ..\third-party\ ; exitIfFailed
+cd $env:DEPS_BUILD_DIR
+cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-cd ..
+cd $buildDir

 # Build Neovim
 mkdir build
 cd build
 cmake -G $cmakeGenerator $(convertToCmakeArgs($nvimCmakeVars)) .. ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-bin\nvim --version ; exitIfFailed
+.\bin\nvim --version ; exitIfFailed
+
+# Ensure that the "win32" feature is set.
+.\bin\nvim -u NONE --headless -c 'exe !has(\"win32\").\"cq\"' ; exitIfFailed

 # Functional tests
 # The $LastExitCode from MSBuild can't be trusted
@@ -113,21 +122,28 @@ cmake --build . --config $cmakeBuildType --target functionaltest -- $cmakeGenera
  foreach { $failed = $failed -or
    $_ -match 'functional tests failed with error'; $_ }
 if ($failed) {
+  if ($uploadToCodecov) {
+    bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
+  }
  exit $LastExitCode
 }
 Set-PSDebug -Strict -Trace 1


 if ($uploadToCodecov) {
-  C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F functionaltest || echo 'codecov upload failed.'"
+  bash -l /c/projects/neovim/ci/common/submit_coverage.sh functionaltest
 }

 # Old tests
+# Add MSYS to path, required for e.g. `find` used in test scripts.
+# But would break functionaltests, where its `more` would be used then.
+$OldPath = $env:PATH
 $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1
+& "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1 ; exitIfFailed
+$env:PATH = $OldPath

 if ($uploadToCodecov) {
-  C:\msys64\usr\bin\bash -lc "cd /c/projects/neovim; bash <(curl -s https://codecov.io/bash) -c -F oldtest || echo 'codecov upload failed.'"
+  bash -l /c/projects/neovim/ci/common/submit_coverage.sh oldtest
 }

 # Build artifacts
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -27,15 +27,13 @@ build_deps() {
  fi

  mkdir -p "${DEPS_BUILD_DIR}"
-  mkdir -p "${DEPS_DOWNLOAD_DIR}"

  # Use cached dependencies if $CACHE_MARKER exists.
  if test "${CACHE_ENABLE}" = "false" ; then
    export CCACHE_RECACHE=1
  elif test -f "${CACHE_MARKER}" ; then
    echo "Using third-party dependencies from Travis cache (last update: $(_stat "${CACHE_MARKER}"))."
-    cp -r "${HOME}/.cache/nvim-deps"/. "${DEPS_BUILD_DIR}"
-    cp -r "${HOME}/.cache/nvim-deps-downloads"/. "${DEPS_DOWNLOAD_DIR}"
+    cp -a "${CACHE_NVIM_DEPS_DIR}"/. "${DEPS_BUILD_DIR}"
  fi

  # Even if we're using cached dependencies, run CMake and make to
@@ -86,12 +84,11 @@ build_nvim() {
  fi

  # Invoke nvim to trigger *San early.
-  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall') ; then
-    asan_check "${LOG_DIR}"
+  if ! (bin/nvim --version && bin/nvim -u NONE -e -cq | cat -vet) ; then
+    check_sanitizer "${LOG_DIR}"
    exit 1
  fi
-  asan_check "${LOG_DIR}"
-
+  check_sanitizer "${LOG_DIR}"

  cd "${TRAVIS_BUILD_DIR}"
 }
--- a/ci/common/submit_coverage.sh
+++ b/ci/common/submit_coverage.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Collect and submit coverage reports.
+#
+# Args:
+# $1: Flag(s) for codecov, separated by comma.
+
+set -ex
+
+# Change to grandparent dir (POSIXly).
+CDPATH='' cd -P -- "$(dirname -- "$0")/../.." || exit
+
+echo "=== running submit_coverage in $PWD: $* ==="
+"$GCOV" --version
+
+# Download/install codecov-bash and gcovr once.
+codecov_sh="${TEMP:-/tmp}/codecov.bash"
+if ! [ -f "$codecov_sh" ]; then
+  curl --retry 5 --silent --fail -o "$codecov_sh" https://codecov.io/bash
+  chmod +x "$codecov_sh"
+
+  python3 -m pip install --quiet --user gcovr
+fi
+
+(
+  cd build
+  python3 -m gcovr --branches --exclude-unreachable-branches --print-summary -j 2 --exclude '.*/auto/.*' --root .. --delete -o ../coverage.xml --xml
+)
+
+# Upload to codecov.
+# -X gcov: disable gcov, done manually above.
+# -X fix: disable fixing of reports (not necessary, rather slow)
+# -Z: exit non-zero on failure
+# -F: flag(s)
+# NOTE: ignoring flags for now, since this causes timeouts on codecov.io then,
+#       which they know about for about a year already...
+# Flags must match pattern ^[\w\,]+$ ("," as separator).
+codecov_flags="$(uname -s),${1}"
+codecov_flags=$(echo "$codecov_flags" | sed 's/[^,_a-zA-Z0-9]/_/g')
+if ! "$codecov_sh" -f coverage.xml -X gcov -X fix -Z -F "${codecov_flags}"; then
+  echo "codecov upload failed."
+fi
+
+# Cleanup always, especially collected data.
+find . \( -name '*.gcov' -o -name '*.gcda' \) -ls -delete | wc -l
+rm -f coverage.xml
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -39,10 +39,11 @@ enter_suite() {

 exit_suite() {
  set +x
-  travis_fold end "${NVIM_TEST_CURRENT_SUITE}"
  if test $FAILED -ne 0 ; then
    echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
    echo "${FAIL_SUMMARY}"
+  else
+    travis_fold end "${NVIM_TEST_CURRENT_SUITE}"
  fi
  export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
  if test "$1" != "--continue" ; then
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -3,10 +3,7 @@

 submit_coverage() {
  if [ -n "${GCOV}" ]; then
-    if curl --fail --output codecov.bash --silent https://codecov.io/bash; then
-      bash codecov.bash -c -F "$1" || echo "codecov upload failed."
-      rm -f codecov.bash
-    fi
+    "${CI_DIR}/common/submit_coverage.sh" "$@" || echo 'codecov upload failed.'
  fi
 }

@@ -32,11 +29,12 @@ check_core_dumps() {
    shift
  fi
  local app="${1:-${BUILD_DIR}/bin/nvim}"
+  local cores
  if test "${TRAVIS_OS_NAME}" = osx ; then
-    local cores="$(find /cores/ -type f -print)"
+    cores="$(find /cores/ -type f -print)"
    local _sudo='sudo'
  else
-    local cores="$(find ./ -type f -name 'core.*' -print)"
+    cores="$(find ./ -type f -name 'core.*' -print)"
    local _sudo=
  fi

@@ -71,6 +69,7 @@ check_logs() {
  for log in $(find "${1}" -type f -name "${2}" -size +0); do
    cat "${log}"
    err=1
+    rm "${log}"
  done
  if test -n "${err}" ; then
    fail 'logs' E 'Runtime errors detected.'
@@ -81,9 +80,9 @@ valgrind_check() {
  check_logs "${1}" "valgrind-*"
 }

-asan_check() {
-  if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
-    check_logs "${1}" "*san.*" | $ASAN_SYMBOLIZE
+check_sanitizer() {
+  if test -n "${CLANG_SANITIZER}"; then
+    check_logs "${1}" "*san.*"
  fi
 }

@@ -94,7 +93,7 @@ run_unittests() {(
    fail 'unittests' F 'Unit tests failed'
  fi
  submit_coverage unittest
-  check_core_dumps "$(which luajit)"
+  check_core_dumps "$(command -v luajit)"
  exit_suite
 )}

@@ -105,7 +104,7 @@ run_functionaltests() {(
    fail 'functionaltests' F 'Functional tests failed'
  fi
  submit_coverage functionaltest
-  asan_check "${LOG_DIR}"
+  check_sanitizer "${LOG_DIR}"
  valgrind_check "${LOG_DIR}"
  check_core_dumps
  exit_suite
@@ -114,12 +113,12 @@ run_functionaltests() {(
 run_oldtests() {(
  enter_suite oldtests
  ulimit -c unlimited || true
-  if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
+  if ! make oldtest; then
    reset
    fail 'oldtests' F 'Legacy tests failed'
  fi
  submit_coverage oldtest
-  asan_check "${LOG_DIR}"
+  check_sanitizer "${LOG_DIR}"
  valgrind_check "${LOG_DIR}"
  check_core_dumps
  exit_suite
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -4,6 +4,7 @@ set -e
 set -o pipefail

 if [[ "${CI_TARGET}" == lint ]]; then
+  python -m pip -q install --user --upgrade flake8
  exit
 fi

@@ -11,18 +12,11 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
  export PATH="/usr/local/opt/ccache/libexec:$PATH"
 fi

-echo "Install neovim module for Python 3."
-# Allow failure. pyenv pip3 on travis is broken:
-# https://github.com/travis-ci/travis-ci/issues/8363
-CC=cc python3 -m pip -q install --user --upgrade neovim || true
-
-if ! [ "${TRAVIS_OS_NAME}" = osx ] ; then
-  # Update PATH for pip.
-  export PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:$PATH"
 # Use default CC to avoid compilation problems when installing Python modules.
+echo "Install neovim module for Python 3."
+CC=cc python3 -m pip -q install --upgrade pynvim
 echo "Install neovim module for Python 2."
-  CC=cc python2.7 -m pip -q install --user --upgrade neovim
-fi
+CC=cc python2 -m pip -q install --upgrade pynvim

 echo "Install neovim RubyGem."
 gem install --no-document --version ">= 0.8.0" neovim
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -9,32 +9,24 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"

 enter_suite 'clint'
-
 run_test 'make clint-full' clint
-
-exit_suite --continue
-
-enter_suite 'testlint'
-
-run_test 'make testlint' testlint
-
 exit_suite --continue

 enter_suite 'lualint'
-
 run_test 'make lualint' lualint
+exit_suite --continue

+enter_suite 'pylint'
+run_test 'make pylint' pylint
 exit_suite --continue

 enter_suite single-includes
-
 CLICOLOR_FORCE=1 run_test_wd \
  --allow-hang \
  10s \
  'make check-single-includes' \
  'csi_clean' \
  single-includes
-
 exit_suite --continue

 end_tests
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -11,3 +11,9 @@ if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
 else
  ci/run_${CI_TARGET}.sh
 fi
+
+if [[ -s "${GCOV_ERROR_FILE}" ]]; then
+  echo '=== Unexpected gcov errors: ==='
+  cat "${GCOV_ERROR_FILE}"
+  exit 1
+fi
--- a/cmake/FindJeMalloc.cmake
+++ b/cmake/FindJeMalloc.cmake
@@ -1,50 +0,0 @@
-# - Try to find jemalloc
-# Once done this will define
-#  JEMALLOC_FOUND - System has jemalloc
-#  JEMALLOC_INCLUDE_DIRS - The jemalloc include directories
-#  JEMALLOC_LIBRARIES - The libraries needed to use jemalloc
-
-if(NOT USE_BUNDLED_JEMALLOC)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_JEMALLOC QUIET jemalloc)
-  endif()
-else()
-  set(PC_JEMALLOC_INCLUDEDIR)
-  set(PC_JEMALLOC_INCLUDE_DIRS)
-  set(PC_JEMALLOC_LIBDIR)
-  set(PC_JEMALLOC_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()
-
-set(JEMALLOC_DEFINITIONS ${PC_JEMALLOC_CFLAGS_OTHER})
-
-find_path(JEMALLOC_INCLUDE_DIR jemalloc/jemalloc.h
-          PATHS ${PC_JEMALLOC_INCLUDEDIR} ${PC_JEMALLOC_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libjemalloc.a as a preferred library name.
-if(JEMALLOC_USE_STATIC)
-  list(APPEND JEMALLOC_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}")
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-  list(INSERT JEMALLOC_NAMES 0
-    "${CMAKE_STATIC_LIBRARY_PREFIX}jemalloc${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
-list(APPEND JEMALLOC_NAMES jemalloc)
-
-find_library(JEMALLOC_LIBRARY NAMES ${JEMALLOC_NAMES}
-  HINTS ${PC_JEMALLOC_LIBDIR} ${PC_JEMALLOC_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
-
-set(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
-set(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(JeMalloc DEFAULT_MSG
-  JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR)
-
-mark_as_advanced(JEMALLOC_INCLUDE_DIR JEMALLOC_LIBRARY)
--- a/cmake/FindLIBVTERM.cmake
+++ b/cmake/FindLIBVTERM.cmake
@@ -0,0 +1,10 @@
+# - Try to find libvterm
+# Once done this will define
+#  LIBVTERM_FOUND - System has libvterm
+#  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
+#  LIBVTERM_LIBRARIES - The libraries needed to use libvterm
+
+include(LibFindMacros)
+
+libfind_pkg_detect(LIBVTERM vterm FIND_PATH vterm.h FIND_LIBRARY vterm)
+libfind_process(LIBVTERM REQUIRED)
--- a/cmake/FindLibIntl.cmake
+++ b/cmake/FindLibIntl.cmake
@@ -31,15 +31,13 @@ find_library(LibIntl_LIBRARY
 )

 if (LibIntl_INCLUDE_DIR)
-  set(CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
+  list(APPEND CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
 endif()
-
 # On some systems (linux+glibc) libintl is passively available.
 # So only specify the library if one was found.
 if (LibIntl_LIBRARY)
-  set(CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
+  list(APPEND CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
 endif()
-
 check_c_source_compiles("
 #include <libintl.h>

@@ -50,6 +48,12 @@ int main(int argc, char** argv) {
  bind_textdomain_codeset(\"foo\", \"bar\");
  textdomain(\"foo\");
 }" HAVE_WORKING_LIBINTL)
+if (LibIntl_INCLUDE_DIR)
+  list(REMOVE_ITEM CMAKE_REQUIRED_INCLUDES "${LibIntl_INCLUDE_DIR}")
+endif()
+if (LibIntl_LIBRARY)
+  list(REMOVE_ITEM CMAKE_REQUIRED_LIBRARIES "${LibIntl_LIBRARY}")
+endif()

 if (HAVE_WORKING_LIBINTL)
  # On some systems (linux+glibc) libintl is passively available.
@@ -58,6 +62,7 @@ if (HAVE_WORKING_LIBINTL)
  if(LibIntl_FIND_REQUIRED)
    unset(LibIntl_FIND_REQUIRED)
  endif()
+  set(LibIntl_FIND_QUIETLY ON)

  check_variable_exists(_nl_msg_cat_cntr HAVE_NL_MSG_CAT_CNTR)
 endif()
--- a/cmake/FindLibLUV.cmake
+++ b/cmake/FindLibLUV.cmake
@@ -0,0 +1,32 @@
+# - Try to find luv
+# Once done this will define
+#  LIBLUV_FOUND - System has libluv
+#  LIBLUV_INCLUDE_DIRS - The libluv include directories
+#  LIBLUV_LIBRARIES - The libraries needed to use libluv
+
+find_package(PkgConfig)
+if (PKG_CONFIG_FOUND)
+  pkg_check_modules(PC_LIBLUV QUIET luv)
+endif()
+
+set(LIBLUV_DEFINITIONS ${PC_LIBLUV_CFLAGS_OTHER})
+
+find_path(LIBLUV_INCLUDE_DIR luv/luv.h
+          PATHS ${PC_LIBLUV_INCLUDEDIR} ${PC_LIBLUV_INCLUDE_DIRS})
+
+# Explicitly look for luv.so. #10407
+list(APPEND LIBLUV_NAMES luv luv${CMAKE_SHARED_LIBRARY_SUFFIX})
+
+find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES}
+  HINTS ${PC_LIBLUV_LIBDIR} ${PC_LIBLUV_LIBRARY_DIRS})
+
+set(LIBLUV_LIBRARIES ${LIBLUV_LIBRARY})
+set(LIBLUV_INCLUDE_DIRS ${LIBLUV_INCLUDE_DIR})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set LIBLUV_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(LibLUV DEFAULT_MSG
+  LIBLUV_LIBRARY LIBLUV_INCLUDE_DIR)
+
+mark_as_advanced(LIBLUV_INCLUDE_DIR LIBLUV_LIBRARY)
--- a/cmake/FindLibTermkey.cmake
+++ b/cmake/FindLibTermkey.cmake
@@ -4,36 +4,20 @@
 #  LIBTERMKEY_INCLUDE_DIRS - The libtermkey include directories
 #  LIBTERMKEY_LIBRARIES - The libraries needed to use libtermkey

-if(NOT USE_BUNDLED_LIBTERMKEY)
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
  pkg_check_modules(PC_LIBTERMKEY QUIET termkey)
 endif()
-else()
-  set(PC_LIBTERMKEY_INCLUDEDIR)
-  set(PC_LIBTERMKEY_INCLUDE_DIRS)
-  set(PC_LIBTERMKEY_LIBDIR)
-  set(PC_LIBTERMKEY_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()

 set(LIBTERMKEY_DEFINITIONS ${PC_LIBTERMKEY_CFLAGS_OTHER})

 find_path(LIBTERMKEY_INCLUDE_DIR termkey.h
-          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libuv.a as a preferred library name.
-if(LIBTERMKEY_USE_STATIC)
-  list(APPEND LIBTERMKEY_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}termkey${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
+          PATHS ${PC_LIBTERMKEY_INCLUDEDIR} ${PC_LIBTERMKEY_INCLUDE_DIRS})

 list(APPEND LIBTERMKEY_NAMES termkey)

 find_library(LIBTERMKEY_LIBRARY NAMES ${LIBTERMKEY_NAMES}
-  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBTERMKEY_LIBDIR} ${PC_LIBTERMKEY_LIBRARY_DIRS})

 set(LIBTERMKEY_LIBRARIES ${LIBTERMKEY_LIBRARY})
 set(LIBTERMKEY_INCLUDE_DIRS ${LIBTERMKEY_INCLUDE_DIR})
--- a/cmake/FindLibUV.cmake
+++ b/cmake/FindLibUV.cmake
@@ -4,38 +4,19 @@
 #  LIBUV_FOUND - system has libuv
 #  LIBUV_INCLUDE_DIRS - the libuv include directories
 #  LIBUV_LIBRARIES - link these to use libuv
-#
-# Set the LIBUV_USE_STATIC variable to specify if static libraries should
-# be preferred to shared ones.

-if(NOT USE_BUNDLED_LIBUV)
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
  pkg_check_modules(PC_LIBUV QUIET libuv)
 endif()
-else()
-  set(PC_LIBUV_INCLUDEDIR)
-  set(PC_LIBUV_INCLUDE_DIRS)
-  set(PC_LIBUV_LIBDIR)
-  set(PC_LIBUV_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()

 find_path(LIBUV_INCLUDE_DIR uv.h
-  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS}
-  ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libuv.a as a preferred library name.
-if(LIBUV_USE_STATIC)
-  list(APPEND LIBUV_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}uv${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif(LIBUV_USE_STATIC)
+  HINTS ${PC_LIBUV_INCLUDEDIR} ${PC_LIBUV_INCLUDE_DIRS})

 list(APPEND LIBUV_NAMES uv)

 find_library(LIBUV_LIBRARY NAMES ${LIBUV_NAMES}
-  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_LIBUV_LIBDIR} ${PC_LIBUV_LIBRARY_DIRS})

 mark_as_advanced(LIBUV_INCLUDE_DIR LIBUV_LIBRARY)

--- a/cmake/FindLibVterm.cmake
+++ b/cmake/FindLibVterm.cmake
@@ -1,47 +0,0 @@
-# - Try to find libvterm
-# Once done this will define
-#  LIBVTERM_FOUND - System has libvterm
-#  LIBVTERM_INCLUDE_DIRS - The libvterm include directories
-#  LIBVTERM_LIBRARIES - The libraries needed to use libvterm
-
-if(NOT USE_BUNDLED_LIBVTERM)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBVTERM QUIET vterm)
-  endif()
-else()
-  set(PC_LIBVTERM_INCLUDEDIR)
-  set(PC_LIBVTERM_INCLUDE_DIRS)
-  set(PC_LIBVTERM_LIBDIR)
-  set(PC_LIBVTERM_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()
-
-set(LIBVTERM_DEFINITIONS ${PC_LIBVTERM_CFLAGS_OTHER})
-
-find_path(LIBVTERM_INCLUDE_DIR vterm.h
-          PATHS ${PC_LIBVTERM_INCLUDEDIR} ${PC_LIBVTERM_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libuv.a as a preferred library name.
-if(LIBVTERM_USE_STATIC)
-  list(APPEND LIBVTERM_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}vterm${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
-list(APPEND LIBVTERM_NAMES vterm)
-
-find_library(LIBVTERM_LIBRARY NAMES ${LIBVTERM_NAMES}
-  HINTS ${PC_LIBVTERM_LIBDIR} ${PC_LIBVTERM_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
-
-set(LIBVTERM_LIBRARIES ${LIBVTERM_LIBRARY})
-set(LIBVTERM_INCLUDE_DIRS ${LIBVTERM_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LIBVTERM_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibVterm DEFAULT_MSG
-  LIBVTERM_LIBRARY LIBVTERM_INCLUDE_DIR)
-
-mark_as_advanced(LIBVTERM_INCLUDE_DIR LIBVTERM_LIBRARY)
--- a/cmake/FindLuaJit.cmake
+++ b/cmake/FindLuaJit.cmake
@@ -4,32 +4,16 @@
 #  LUAJIT_INCLUDE_DIRS - The luajit include directories
 #  LUAJIT_LIBRARIES - The libraries needed to use luajit

-if(NOT USE_BUNDLED_LUAJIT)
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
  pkg_check_modules(PC_LUAJIT QUIET luajit)
 endif()
-else()
-  set(PC_LUAJIT_INCLUDEDIR)
-  set(PC_LUAJIT_INCLUDE_DIRS)
-  set(PC_LUAJIT_LIBDIR)
-  set(PC_LUAJIT_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()

 set(LUAJIT_DEFINITIONS ${PC_LUAJIT_CFLAGS_OTHER})

 find_path(LUAJIT_INCLUDE_DIR luajit.h
          PATHS ${PC_LUAJIT_INCLUDEDIR} ${PC_LUAJIT_INCLUDE_DIRS}
-          PATH_SUFFIXES luajit-2.0
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libluajit-5.1.a as a preferred
-# library name.
-if(LUAJIT_USE_STATIC)
-  list(APPEND LUAJIT_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}luajit-5.1${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
+          PATH_SUFFIXES luajit-2.0 luajit-2.1)

 if(MSVC)
  list(APPEND LUAJIT_NAMES lua51)
@@ -40,8 +24,7 @@ else()
 endif()

 find_library(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES}
-             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS}
-             ${LIMIT_SEARCH})
+             PATHS ${PC_LUAJIT_LIBDIR} ${PC_LUAJIT_LIBRARY_DIRS})

 set(LUAJIT_LIBRARIES ${LUAJIT_LIBRARY})
 set(LUAJIT_INCLUDE_DIRS ${LUAJIT_INCLUDE_DIR})
--- a/cmake/FindMsgpack.cmake
+++ b/cmake/FindMsgpack.cmake
@@ -4,26 +4,17 @@
 #  MSGPACK_INCLUDE_DIRS - The msgpack include directories
 #  MSGPACK_LIBRARIES - The libraries needed to use msgpack

-if(NOT USE_BUNDLED_MSGPACK)
 find_package(PkgConfig)
 if (PKG_CONFIG_FOUND)
  pkg_search_module(PC_MSGPACK QUIET
    msgpackc>=${Msgpack_FIND_VERSION}
    msgpack>=${Msgpack_FIND_VERSION})
 endif()
-else()
-  set(PC_MSGPACK_INCLUDEDIR)
-  set(PC_MSGPACK_INCLUDE_DIRS)
-  set(PC_MSGPACK_LIBDIR)
-  set(PC_MSGPACK_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()

 set(MSGPACK_DEFINITIONS ${PC_MSGPACK_CFLAGS_OTHER})

 find_path(MSGPACK_INCLUDE_DIR msgpack/version_master.h
-  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS})

 if(MSGPACK_INCLUDE_DIR)
  file(READ ${MSGPACK_INCLUDE_DIR}/msgpack/version_master.h msgpack_version_h)
@@ -35,13 +26,6 @@ else()
  set(MSGPACK_VERSION_STRING)
 endif()

-# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name.
-if(MSGPACK_USE_STATIC)
-  list(APPEND MSGPACK_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}"
-    "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
 if(MSVC)
  # The import library for the msgpack DLL has a different name
  list(APPEND MSGPACK_NAMES msgpackc_import)
@@ -53,8 +37,7 @@ find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES}
  # Check each directory for all names to avoid using headers/libraries from
  # different places.
  NAMES_PER_DIR
-  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
+  HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS})

 mark_as_advanced(MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY)

--- a/cmake/FindUNIBILIUM.cmake
+++ b/cmake/FindUNIBILIUM.cmake
@@ -0,0 +1,12 @@
+# - Try to find unibilium
+# Once done this will define
+#  UNIBILIUM_FOUND - System has unibilium
+#  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
+#  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
+
+include(LibFindMacros)
+
+libfind_pkg_detect(UNIBILIUM unibilium
+  FIND_PATH unibilium.h
+  FIND_LIBRARY unibilium)
+libfind_process(UNIBILIUM)
--- a/cmake/FindUnibilium.cmake
+++ b/cmake/FindUnibilium.cmake
@@ -1,47 +0,0 @@
-# - Try to find unibilium
-# Once done this will define
-#  UNIBILIUM_FOUND - System has unibilium
-#  UNIBILIUM_INCLUDE_DIRS - The unibilium include directories
-#  UNIBILIUM_LIBRARIES - The libraries needed to use unibilium
-
-if(NOT USE_BUNDLED_UNIBILIUM)
-  find_package(PkgConfig)
-  if (PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_UNIBILIUM QUIET unibilium)
-  endif()
-else()
-  set(PC_UNIBILIUM_INCLUDEDIR)
-  set(PC_UNIBILIUM_INCLUDE_DIRS)
-  set(PC_UNIBILIUM_LIBDIR)
-  set(PC_UNIBILIUM_LIBRARY_DIRS)
-  set(LIMIT_SEARCH NO_DEFAULT_PATH)
-endif()
-
-set(UNIBILIUM_DEFINITIONS ${PC_UNIBILIUM_CFLAGS_OTHER})
-
-find_path(UNIBILIUM_INCLUDE_DIR unibilium.h
-          PATHS ${PC_UNIBILIUM_INCLUDEDIR} ${PC_UNIBILIUM_INCLUDE_DIRS}
-          ${LIMIT_SEARCH})
-
-# If we're asked to use static linkage, add libunibilium.a as a preferred library name.
-if(UNIBILIUM_USE_STATIC)
-  list(APPEND UNIBILIUM_NAMES
-    "${CMAKE_STATIC_LIBRARY_PREFIX}unibilium${CMAKE_STATIC_LIBRARY_SUFFIX}")
-endif()
-
-list(APPEND UNIBILIUM_NAMES unibilium)
-
-find_library(UNIBILIUM_LIBRARY NAMES ${UNIBILIUM_NAMES}
-  HINTS ${PC_UNIBILIUM_LIBDIR} ${PC_UNIBILIUM_LIBRARY_DIRS}
-  ${LIMIT_SEARCH})
-
-set(UNIBILIUM_LIBRARIES ${UNIBILIUM_LIBRARY})
-set(UNIBILIUM_INCLUDE_DIRS ${UNIBILIUM_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set UNIBILIUM_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(unibilium DEFAULT_MSG
-  UNIBILIUM_LIBRARY UNIBILIUM_INCLUDE_DIR)
-
-mark_as_advanced(UNIBILIUM_INCLUDE_DIR UNIBILIUM_LIBRARY)
--- a/cmake/GenerateHelptags.cmake.in
+++ b/cmake/GenerateHelptags.cmake.in
@@ -1,39 +0,0 @@
-if(DEFINED ENV{DESTDIR})
-  file(TO_CMAKE_PATH
-    $ENV{DESTDIR}/@CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
-    HELPTAGS_WORKING_DIRECTORY)
-else()
-  file(TO_CMAKE_PATH
-    @CMAKE_INSTALL_FULL_DATADIR@/nvim/runtime/doc
-    HELPTAGS_WORKING_DIRECTORY)
-endif()
-
-message(STATUS "Generating helptags in ${HELPTAGS_WORKING_DIRECTORY}")
-if(EXISTS ${HELPTAGS_WORKING_DIRECTORY}/)
-  message(STATUS "${HELPTAGS_WORKING_DIRECTORY} already exists")
-  # If the doc directory already exists, helptags could fail due to duplicate
-  # tags. Tell the user to remove the directory and try again.
-  set(TROUBLESHOOTING "\nRemove \"${HELPTAGS_WORKING_DIRECTORY}\" and try again.")
-endif()
-
-# Workaround for hanging "yes | nvim -c 'helptags ++t .'"
-# and therefore hanging "yes | make install":
-# Set INPUT_FILE to an empty file, causing execute_process
-# to disregard other standard input (such as "yes |").
-set(EMPTY_FILE ${CMAKE_CURRENT_BINARY_DIR}/.GenerateHelptags)
-file(WRITE ${EMPTY_FILE} "")
-execute_process(
-  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/bin/nvim
-    -u NONE
-    -es
-    -c "helptags ++t ."
-    -c quit
-  WORKING_DIRECTORY ${HELPTAGS_WORKING_DIRECTORY}
-  INPUT_FILE ${EMPTY_FILE}
-  OUTPUT_VARIABLE err
-  ERROR_VARIABLE err
-  RESULT_VARIABLE res)
-
-if(NOT res EQUAL 0)
-  message(FATAL_ERROR "Generating helptags failed: ${err} - ${res}${TROUBLESHOOTING}")
-endif()
--- a/cmake/GetCompileFlags.cmake
+++ b/cmake/GetCompileFlags.cmake
@@ -1,6 +1,6 @@
 function(get_compile_flags _compile_flags)
  # Create template akin to CMAKE_C_COMPILE_OBJECT.
-  set(compile_flags "<CMAKE_C_COMPILER> <CFLAGS> <BUILD_TYPE_CFLAGS> <DEFINITIONS> <INCLUDES>")
+  set(compile_flags "<CMAKE_C_COMPILER> <CFLAGS> <BUILD_TYPE_CFLAGS> <COMPILE_OPTIONS><COMPILE_DEFINITIONS> <INCLUDES>")

  # Get C compiler.
  string(REPLACE
@@ -9,13 +9,36 @@ function(get_compile_flags _compile_flags)
    compile_flags
    "${compile_flags}")

-  # Get flags set by add_definition().
-  get_directory_property(definitions
-    DIRECTORY "src/nvim"
-    DEFINITIONS)
+  # Get flags set by add_definitions().
+  get_property(compile_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+  get_target_property(compile_definitions_target nvim COMPILE_DEFINITIONS)
+  if(compile_definitions_target)
+    list(APPEND compile_definitions ${compile_definitions_target})
+    list(REMOVE_DUPLICATES compile_definitions)
+  endif()
+  # NOTE: list(JOIN) requires CMake 3.12, string(CONCAT) requires CMake 3.
+  string(REPLACE ";" " -D" compile_definitions "${compile_definitions}")
+  if(compile_definitions)
+    set(compile_definitions " -D${compile_definitions}")
+  endif()
  string(REPLACE
-    "<DEFINITIONS>"
-    "${definitions}"
+    "<COMPILE_DEFINITIONS>"
+    "${compile_definitions}"
+    compile_flags
+    "${compile_flags}")
+
+  # Get flags set by add_compile_options().
+  get_property(compile_options DIRECTORY PROPERTY COMPILE_OPTIONS)
+  get_target_property(compile_options_target nvim COMPILE_OPTIONS)
+  if(compile_options_target)
+    list(APPEND compile_options ${compile_options_target})
+    list(REMOVE_DUPLICATES compile_options)
+  endif()
+  # NOTE: list(JOIN) requires CMake 3.12.
+  string(REPLACE ";" " " compile_options "${compile_options}")
+  string(REPLACE
+    "<COMPILE_OPTIONS>"
+    "${compile_options}"
    compile_flags
    "${compile_flags}")

@@ -35,9 +58,7 @@ function(get_compile_flags _compile_flags)
    "${compile_flags}")

  # Get include directories.
-  get_directory_property(include_directories_list
-    DIRECTORY "src/nvim"
-    INCLUDE_DIRECTORIES)
+  get_property(include_directories_list DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
  list(REMOVE_DUPLICATES include_directories_list)
  foreach(include_directory ${include_directories_list})
    set(include_directories "${include_directories} -I${include_directory}")
--- a/cmake/LibFindMacros.cmake
+++ b/cmake/LibFindMacros.cmake
@@ -1,46 +1,101 @@
-# Version 1.0 (2013-04-12)
-# Public Domain, originally written by Lasse Kärkkäinen <tronic@zi.fi>
-# Published at http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries
+# Version 2.2
+# Public Domain, originally written by Lasse Kärkkäinen <tronic>
+# Maintained at https://github.com/Tronic/cmake-modules
+# Please send your improvements as pull requests on Github.

-# If you improve the script, please modify the forementioned wiki page because
-# I no longer maintain my scripts (hosted as static files at zi.fi). Feel free
-# to remove this entire header if you use real version control instead.
-
-# Changelog:
-# 2013-04-12  Added version number (1.0) and this header, no other changes
-# 2009-10-08  Originally published
-
-
-# Works the same as find_package, but forwards the "REQUIRED" and "QUIET" arguments
-# used for the current package. For this to work, the first parameter must be the
-# prefix of the current package, then the prefix of the new package etc, which are
-# passed to find_package.
-macro (libfind_package PREFIX)
-  set (LIBFIND_PACKAGE_ARGS ${ARGN})
-  if (${PREFIX}_FIND_QUIETLY)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} QUIET)
-  endif (${PREFIX}_FIND_QUIETLY)
+# Find another package and make it a dependency of the current package.
+# This also automatically forwards the "REQUIRED" argument.
+# Usage: libfind_package(<prefix> <another package> [extra args to find_package])
+macro (libfind_package PREFIX PKG)
+  set(${PREFIX}_args ${PKG} ${ARGN})
  if (${PREFIX}_FIND_REQUIRED)
-    set (LIBFIND_PACKAGE_ARGS ${LIBFIND_PACKAGE_ARGS} REQUIRED)
-  endif (${PREFIX}_FIND_REQUIRED)
-  find_package(${LIBFIND_PACKAGE_ARGS})
-endmacro (libfind_package)
+    set(${PREFIX}_args ${${PREFIX}_args} REQUIRED)
+  endif()
+  find_package(${${PREFIX}_args})
+  set(${PREFIX}_DEPENDENCIES ${${PREFIX}_DEPENDENCIES};${PKG})
+  unset(${PREFIX}_args)
+endmacro()

-# CMake developers made the UsePkgConfig system deprecated in the same release (2.6)
-# where they added pkg_check_modules. Consequently I need to support both in my scripts
-# to avoid those deprecated warnings. Here's a helper that does just that.
-# Works identically to pkg_check_modules, except that no checks are needed prior to use.
-macro (libfind_pkg_check_modules PREFIX PKGNAME)
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    include(UsePkgConfig)
-    pkgconfig(${PKGNAME} ${PREFIX}_INCLUDE_DIRS ${PREFIX}_LIBRARY_DIRS ${PREFIX}_LDFLAGS ${PREFIX}_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    find_package(PkgConfig)
+# A simple wrapper to make pkg-config searches a bit easier.
+# Works the same as CMake's internal pkg_check_modules but is always quiet.
+macro (libfind_pkg_check_modules)
+  find_package(PkgConfig QUIET)
  if (PKG_CONFIG_FOUND)
-      pkg_check_modules(${PREFIX} ${PKGNAME})
-    endif (PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-endmacro (libfind_pkg_check_modules)
+    pkg_check_modules(${ARGN} QUIET)
+  endif()
+endmacro()
+
+# Avoid useless copy&pasta by doing what most simple libraries do anyway:
+# pkg-config, find headers, find library.
+# Usage: libfind_pkg_detect(<prefix> <pkg-config args> FIND_PATH <name> [other args] FIND_LIBRARY <name> [other args])
+# E.g. libfind_pkg_detect(SDL2 sdl2 FIND_PATH SDL.h PATH_SUFFIXES SDL2 FIND_LIBRARY SDL2)
+function (libfind_pkg_detect PREFIX)
+  # Parse arguments
+  set(argname pkgargs)
+  foreach (i ${ARGN})
+    if ("${i}" STREQUAL "FIND_PATH")
+      set(argname pathargs)
+    elseif ("${i}" STREQUAL "FIND_LIBRARY")
+      set(argname libraryargs)
+    else()
+      set(${argname} ${${argname}} ${i})
+    endif()
+  endforeach()
+  if (NOT pkgargs)
+    message(FATAL_ERROR "libfind_pkg_detect requires at least a pkg_config package name to be passed.")
+  endif()
+  # Find library
+  libfind_pkg_check_modules(${PREFIX}_PKGCONF ${pkgargs})
+  if (pathargs)
+    find_path(${PREFIX}_INCLUDE_DIR NAMES ${pathargs} HINTS ${${PREFIX}_PKGCONF_INCLUDE_DIRS})
+  endif()
+  if (libraryargs)
+    find_library(${PREFIX}_LIBRARY NAMES ${libraryargs} HINTS ${${PREFIX}_PKGCONF_LIBRARY_DIRS})
+  endif()
+  # Read pkg-config version
+  if (${PREFIX}_PKGCONF_VERSION)
+    set(${PREFIX}_VERSION ${${PREFIX}_PKGCONF_VERSION} PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Extracts a version #define from a version.h file, output stored to <PREFIX>_VERSION.
+# Usage: libfind_version_header(Foobar foobar/version.h FOOBAR_VERSION_STR)
+# Fourth argument "QUIET" may be used for silently testing different define names.
+# This function does nothing if the version variable is already defined.
+function (libfind_version_header PREFIX VERSION_H DEFINE_NAME)
+  # Skip processing if we already have a version or if the include dir was not found
+  if (${PREFIX}_VERSION OR NOT ${PREFIX}_INCLUDE_DIR)
+    return()
+  endif()
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  # Process optional arguments
+  foreach(arg ${ARGN})
+    if (arg STREQUAL "QUIET")
+      set(quiet TRUE)
+    else()
+      message(AUTHOR_WARNING "Unknown argument ${arg} to libfind_version_header ignored.")
+    endif()
+  endforeach()
+  # Read the header and parse for version number
+  set(filename "${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+  if (NOT EXISTS ${filename})
+    if (NOT quiet)
+      message(AUTHOR_WARNING "Unable to find ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+    endif()
+    return()
+  endif()
+  file(READ "${filename}" header)
+  string(REGEX REPLACE ".*#[ \t]*define[ \t]*${DEFINE_NAME}[ \t]*\"([^\n]*)\".*" "\\1" match "${header}")
+  # No regex match?
+  if (match STREQUAL header)
+    if (NOT quiet)
+      message(AUTHOR_WARNING "Unable to find \#define ${DEFINE_NAME} \"<version>\" from ${${PREFIX}_INCLUDE_DIR}/${VERSION_H}")
+    endif()
+    return()
+  endif()
+  # Export the version string
+  set(${PREFIX}_VERSION "${match}" PARENT_SCOPE)
+endfunction()

 # Do the final processing once the paths have been detected.
 # If include dirs are needed, ${PREFIX}_PROCESS_INCLUDES should be set to contain
@@ -48,65 +103,167 @@ endmacro (libfind_pkg_check_modules)
 # Ditto for ${PREFIX}_PROCESS_LIBS and library files.
 # Will set ${PREFIX}_FOUND, ${PREFIX}_INCLUDE_DIRS and ${PREFIX}_LIBRARIES.
 # Also handles errors in case library detection was required, etc.
-macro (libfind_process PREFIX)
-  # Skip processing if already processed during this run
-  if (NOT ${PREFIX}_FOUND)
-    # Start with the assumption that the library was found
-    set (${PREFIX}_FOUND TRUE)
-
-    # Process all includes and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_INCLUDES})
-      if (${i})
-        set (${PREFIX}_INCLUDE_DIRS ${${PREFIX}_INCLUDE_DIRS} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Process all libraries and set _FOUND to false if any are missing
-    foreach (i ${${PREFIX}_PROCESS_LIBS})
-      if (${i})
-        set (${PREFIX}_LIBRARIES ${${PREFIX}_LIBRARIES} ${${i}})
-        mark_as_advanced(${i})
-      else (${i})
-        set (${PREFIX}_FOUND FALSE)
-      endif (${i})
-    endforeach (i)
-
-    # Print message and/or exit on fatal error
+function (libfind_process PREFIX)
+  # Skip processing if already processed during this configuration run
  if (${PREFIX}_FOUND)
-      if (NOT ${PREFIX}_FIND_QUIETLY)
+    return()
+  endif()
+
+  set(found TRUE)  # Start with the assumption that the package was found
+
+  # Did we find any files? Did we miss includes? These are for formatting better error messages.
+  set(some_files FALSE)
+  set(missing_headers FALSE)
+
+  # Shorthands for some variables that we need often
+  set(quiet ${${PREFIX}_FIND_QUIETLY})
+  set(required ${${PREFIX}_FIND_REQUIRED})
+  set(exactver ${${PREFIX}_FIND_VERSION_EXACT})
+  set(findver "${${PREFIX}_FIND_VERSION}")
+  set(version "${${PREFIX}_VERSION}")
+
+  # Lists of config option names (all, includes, libs)
+  unset(configopts)
+  set(includeopts ${${PREFIX}_PROCESS_INCLUDES})
+  set(libraryopts ${${PREFIX}_PROCESS_LIBS})
+
+  # Process deps to add to
+  foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES})
+    if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS)
+      # The package seems to export option lists that we can use, woohoo!
+      list(APPEND includeopts ${${i}_INCLUDE_OPTS})
+      list(APPEND libraryopts ${${i}_LIBRARY_OPTS})
+    else()
+      # If plural forms don't exist or they equal singular forms
+      if ((NOT DEFINED ${i}_INCLUDE_DIRS AND NOT DEFINED ${i}_LIBRARIES) OR
+          (${i}_INCLUDE_DIR STREQUAL ${i}_INCLUDE_DIRS AND ${i}_LIBRARY STREQUAL ${i}_LIBRARIES))
+        # Singular forms can be used
+        if (DEFINED ${i}_INCLUDE_DIR)
+          list(APPEND includeopts ${i}_INCLUDE_DIR)
+        endif()
+        if (DEFINED ${i}_LIBRARY)
+          list(APPEND libraryopts ${i}_LIBRARY)
+        endif()
+      else()
+        # Oh no, we don't know the option names
+        message(FATAL_ERROR "We couldn't determine config variable names for ${i} includes and libs. Aieeh!")
+      endif()
+    endif()
+  endforeach()
+
+  if (includeopts)
+    list(REMOVE_DUPLICATES includeopts)
+  endif()
+
+  if (libraryopts)
+    list(REMOVE_DUPLICATES libraryopts)
+  endif()
+
+  string(REGEX REPLACE ".*[ ;]([^ ;]*(_INCLUDE_DIRS|_LIBRARIES))" "\\1" tmp "${includeopts} ${libraryopts}")
+  if (NOT tmp STREQUAL "${includeopts} ${libraryopts}")
+    message(AUTHOR_WARNING "Plural form ${tmp} found in config options of ${PREFIX}. This works as before but is now deprecated. Please only use singular forms INCLUDE_DIR and LIBRARY, and update your find scripts for LibFindMacros > 2.0 automatic dependency system (most often you can simply remove the PROCESS variables entirely).")
+  endif()
+
+  # Include/library names separated by spaces (notice: not CMake lists)
+  unset(includes)
+  unset(libs)
+
+  # Process all includes and set found false if any are missing
+  foreach (i ${includeopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND includes "${${i}}")
+    else()
+      set(found FALSE)
+      set(missing_headers TRUE)
+    endif()
+  endforeach()
+
+  # Process all libraries and set found false if any are missing
+  foreach (i ${libraryopts})
+    list(APPEND configopts ${i})
+    if (NOT "${${i}}" STREQUAL "${i}-NOTFOUND")
+      list(APPEND libs "${${i}}")
+    else()
+      set (found FALSE)
+    endif()
+  endforeach()
+
+  # Version checks
+  if (found AND findver)
+    if (NOT version)
+      message(WARNING "The find module for ${PREFIX} does not provide version information, so we'll just assume that it is OK. Please fix the module or remove package version requirements to get rid of this warning.")
+    elseif (version VERSION_LESS findver OR (exactver AND NOT version VERSION_EQUAL findver))
+      set(found FALSE)
+      set(version_unsuitable TRUE)
+    endif()
+  endif()
+
+  # If all-OK, hide all config options, export variables, print status and exit
+  if (found)
+    foreach (i ${configopts})
+      mark_as_advanced(${i})
+    endforeach()
+    if (NOT quiet)
      message(STATUS "Found ${PREFIX} ${${PREFIX}_VERSION}")
-      endif (NOT ${PREFIX}_FIND_QUIETLY)
-    else (${PREFIX}_FOUND)
-      if (${PREFIX}_FIND_REQUIRED)
-        foreach (i ${${PREFIX}_PROCESS_INCLUDES} ${${PREFIX}_PROCESS_LIBS})
-          message("${i}=${${i}}")
-        endforeach (i)
-        message (FATAL_ERROR "Required library ${PREFIX} NOT FOUND.\nInstall the library (dev version) and try again. If the library is already installed, use ccmake to set the missing variables manually.")
-      endif (${PREFIX}_FIND_REQUIRED)
-    endif (${PREFIX}_FOUND)
-  endif (NOT ${PREFIX}_FOUND)
-endmacro (libfind_process)
+      if (LIBFIND_DEBUG)
+        message(STATUS "  ${PREFIX}_DEPENDENCIES=${${PREFIX}_DEPENDENCIES}")
+        message(STATUS "  ${PREFIX}_INCLUDE_OPTS=${includeopts}")
+        message(STATUS "  ${PREFIX}_INCLUDE_DIRS=${includes}")
+        message(STATUS "  ${PREFIX}_LIBRARY_OPTS=${libraryopts}")
+        message(STATUS "  ${PREFIX}_LIBRARIES=${libs}")
+      endif()
+    endif()
+    set (${PREFIX}_INCLUDE_OPTS ${includeopts} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARY_OPTS ${libraryopts} PARENT_SCOPE)
+    set (${PREFIX}_INCLUDE_DIRS ${includes} PARENT_SCOPE)
+    set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE)
+    set (${PREFIX}_FOUND TRUE PARENT_SCOPE)
+    return()
+  endif()

-macro(libfind_library PREFIX basename)
-  set(TMP "")
-  if(MSVC80)
-    set(TMP -vc80)
-  endif(MSVC80)
-  if(MSVC90)
-    set(TMP -vc90)
-  endif(MSVC90)
-  set(${PREFIX}_LIBNAMES ${basename}${TMP})
-  if(${ARGC} GREATER 2)
-    set(${PREFIX}_LIBNAMES ${basename}${TMP}-${ARGV2})
-    string(REGEX REPLACE "\\." "_" TMP ${${PREFIX}_LIBNAMES})
-    set(${PREFIX}_LIBNAMES ${${PREFIX}_LIBNAMES} ${TMP})
-  endif(${ARGC} GREATER 2)
-  find_library(${PREFIX}_LIBRARY
-    NAMES ${${PREFIX}_LIBNAMES}
-    PATHS ${${PREFIX}_PKGCONF_LIBRARY_DIRS}
-  )
-endmacro(libfind_library)
+  # Format messages for debug info and the type of error
+  set(vars "Relevant CMake configuration variables:\n")
+  foreach (i ${configopts})
+    mark_as_advanced(CLEAR ${i})
+    set(val ${${i}})
+    if ("${val}" STREQUAL "${i}-NOTFOUND")
+      set (val "<not found>")
+    elseif (val AND NOT EXISTS ${val})
+      set (val "${val}  (does not exist)")
+    else()
+      set(some_files TRUE)
+    endif()
+    set(vars "${vars}  ${i}=${val}\n")
+  endforeach()
+  set(vars "${vars}You may use CMake GUI, cmake -D or ccmake to modify the values. Delete CMakeCache.txt to discard all values and force full re-detection if necessary.\n")
+  if (version_unsuitable)
+    set(msg "${PREFIX} ${${PREFIX}_VERSION} was found but")
+    if (exactver)
+      set(msg "${msg} only version ${findver} is acceptable.")
+    else()
+      set(msg "${msg} version ${findver} is the minimum requirement.")
+    endif()
+  else()
+    if (missing_headers)
+      set(msg "We could not find development headers for ${PREFIX}. Do you have the necessary dev package installed?")
+    elseif (some_files)
+      set(msg "We only found some files of ${PREFIX}, not all of them. Perhaps your installation is incomplete or maybe we just didn't look in the right place?")
+      if(findver)
+        set(msg "${msg} This could also be caused by incompatible version (if it helps, at least ${PREFIX} ${findver} should work).")
+      endif()
+    else()
+      set(msg "We were unable to find package ${PREFIX}.")
+    endif()
+  endif()

+  # Fatal error out if REQUIRED
+  if (required)
+    set(msg "REQUIRED PACKAGE NOT FOUND\n${msg} This package is REQUIRED and you need to install it or adjust CMake configuration in order to continue building ${CMAKE_PROJECT_NAME}.")
+    message(FATAL_ERROR "${msg}\n${vars}")
+  endif()
+  # Otherwise just print a nasty warning
+  if (NOT quiet)
+    message(WARNING "WARNING: MISSING PACKAGE\n${msg} This package is NOT REQUIRED and you may ignore this warning but by doing so you may miss some functionality of ${CMAKE_PROJECT_NAME}. \n${vars}")
+  endif()
+endfunction()
--- a/cmake/RunLuacheck.cmake
+++ b/cmake/RunLuacheck.cmake
@@ -1,22 +0,0 @@
-set(LUACHECK_ARGS -q "${LUAFILES_DIR}")
-if(DEFINED IGNORE_PATTERN)
-  list(APPEND LUACHECK_ARGS --exclude-files "${LUAFILES_DIR}/${IGNORE_PATTERN}")
-endif()
-if(DEFINED CHECK_PATTERN)
-  list(APPEND LUACHECK_ARGS --include-files "${LUAFILES_DIR}/${CHECK_PATTERN}")
-endif()
-if(DEFINED READ_GLOBALS)
-  list(APPEND LUACHECK_ARGS --read-globals "${READ_GLOBALS}")
-endif()
-
-execute_process(
-  COMMAND "${LUACHECK_PRG}" ${LUACHECK_ARGS}
-  WORKING_DIRECTORY "${LUAFILES_DIR}"
-  ERROR_VARIABLE err
-  RESULT_VARIABLE res
-)
-
-if(NOT res EQUAL 0)
-  message(STATUS "Output to stderr:\n${err}")
-  message(FATAL_ERROR "Linting tests failed with error: ${res}")
-endif()
--- a/cmake/RunTests.cmake
+++ b/cmake/RunTests.cmake
@@ -1,13 +1,18 @@
 # Set LC_ALL to meet expectations of some locale-sensitive tests.
 set(ENV{LC_ALL} "en_US.UTF-8")

+if(POLICY CMP0012)
+  # Handle CI=true, without dev warnings.
+  cmake_policy(SET CMP0012 NEW)
+endif()
+
 set(ENV{VIMRUNTIME} ${WORKING_DIR}/runtime)
-set(ENV{NVIM_RPLUGIN_MANIFEST} ${WORKING_DIR}/Xtest_rplugin_manifest)
-set(ENV{XDG_CONFIG_HOME} ${WORKING_DIR}/Xtest_xdg/config)
-set(ENV{XDG_DATA_HOME} ${WORKING_DIR}/Xtest_xdg/share)
+set(ENV{NVIM_RPLUGIN_MANIFEST} ${BUILD_DIR}/Xtest_rplugin_manifest)
+set(ENV{XDG_CONFIG_HOME} ${BUILD_DIR}/Xtest_xdg/config)
+set(ENV{XDG_DATA_HOME} ${BUILD_DIR}/Xtest_xdg/share)

 if(NOT DEFINED ENV{NVIM_LOG_FILE})
-  set(ENV{NVIM_LOG_FILE} ${WORKING_DIR}/.nvimlog)
+  set(ENV{NVIM_LOG_FILE} ${BUILD_DIR}/.nvimlog)
 endif()

 if(NVIM_PRG)
@@ -20,38 +25,62 @@ else()
  set(TEST_PATH "${TEST_DIR}/${TEST_TYPE}")
 endif()

+# Force $TEST_PATH to workdir-relative path ("test/…").
+if(IS_ABSOLUTE ${TEST_PATH})
+  file(RELATIVE_PATH TEST_PATH "${WORKING_DIR}" "${TEST_PATH}")
+endif()
+
 if(BUSTED_OUTPUT_TYPE STREQUAL junit)
  set(EXTRA_ARGS OUTPUT_FILE ${BUILD_DIR}/${TEST_TYPE}test-junit.xml)
 endif()

+set(BUSTED_ARGS $ENV{BUSTED_ARGS})
+separate_arguments(BUSTED_ARGS)
+
 if(DEFINED ENV{TEST_TAG} AND NOT "$ENV{TEST_TAG}" STREQUAL "")
-  set(TEST_TAG "--tags=$ENV{TEST_TAG}")
+  list(APPEND BUSTED_ARGS --tags $ENV{TEST_TAG})
 endif()

 if(DEFINED ENV{TEST_FILTER} AND NOT "$ENV{TEST_FILTER}" STREQUAL "")
-  set(TEST_FILTER "--filter=$ENV{TEST_FILTER}")
+  list(APPEND BUSTED_ARGS --filter $ENV{TEST_FILTER})
 endif()

-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${WORKING_DIR}/Xtest-tmpdir)
-set(ENV{TMPDIR} ${WORKING_DIR}/Xtest-tmpdir)
-set(ENV{SYSTEM_NAME} ${SYSTEM_NAME})
+# TMPDIR: use relative test path (for parallel test runs / isolation).
+set(ENV{TMPDIR} "${BUILD_DIR}/Xtest_tmpdir/${TEST_PATH}")
+execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory $ENV{TMPDIR})
+
+set(ENV{SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_NAME})  # used by test/helpers.lua.
 execute_process(
-  COMMAND ${BUSTED_PRG} ${TEST_TAG} ${TEST_FILTER} -v -o ${BUSTED_OUTPUT_TYPE}
-    --lua=${LUA_PRG} --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
+  COMMAND ${BUSTED_PRG} -v -o test.busted.outputHandlers.${BUSTED_OUTPUT_TYPE}
+    --lazy --helper=${TEST_DIR}/${TEST_TYPE}/preload.lua
    --lpath=${BUILD_DIR}/?.lua
    --lpath=${WORKING_DIR}/runtime/lua/?.lua
    --lpath=?.lua
+    ${BUSTED_ARGS}
    ${TEST_PATH}
  WORKING_DIRECTORY ${WORKING_DIR}
  ERROR_VARIABLE err
  RESULT_VARIABLE res
  ${EXTRA_ARGS})

-file(REMOVE ${WORKING_DIR}/Xtest_rplugin_manifest)
-file(REMOVE_RECURSE ${WORKING_DIR}/Xtest_xdg)
-file(REMOVE_RECURSE ${WORKING_DIR}/Xtest-tmpdir)
+file(GLOB RM_FILES ${BUILD_DIR}/Xtest_*)
+file(REMOVE_RECURSE ${RM_FILES})

 if(NOT res EQUAL 0)
+  message(STATUS "Tests exited non-zero: ${res}")
+  if("${err}" STREQUAL "")
+    message(STATUS "No output to stderr.")
+  else()
    message(STATUS "Output to stderr:\n${err}")
+  endif()
+
+  # Dump the logfile on CI (if not displayed and moved already).
+  if($ENV{CI})
+    if(EXISTS $ENV{NVIM_LOG_FILE} AND NOT EXISTS $ENV{NVIM_LOG_FILE}.displayed)
+      file(READ $ENV{NVIM_LOG_FILE} out)
+      message(STATUS "$NVIM_LOG_FILE: $ENV{NVIM_LOG_FILE}\n${out}")
+    endif()
+  endif()
+
  message(FATAL_ERROR "${TEST_TYPE} tests failed with error: ${res}")
 endif()
--- a/cmake/mingw32-w64-cross-travis.toolchain.cmake
+++ b/cmake/mingw32-w64-cross-travis.toolchain.cmake
@@ -1,53 +0,0 @@
-#
-# Mingw-w64 cross compiler toolchain
-#
-# - The usual CMAKE variables will point to the cross compiler
-# - HOST_EXE_LINKER, HOST_C_COMPILER, HOST_EXE_LINKER_FLAGS,
-#   HOST_C_FLAGS point to a host compiler
-#
-
-set(MINGW_TRIPLET i686-w64-mingw32)
-# For x86_64 use
-#set(MINGW_TRIPLET x86_64-w64-mingw32)
-
-# The location of your toolchain sys-root
-set(MINGW_PREFIX_PATH /opt/mingw32/${MINGW_TRIPLET}/)
-# or sometimes like this
-#set(MINGW_PREFIX_PATH /usr/${MINGW_TRIPLET}/sys-root)
-
-# the name of the target operating system
-set(CMAKE_SYSTEM_NAME Windows)
-
-# which compilers to use for C and C++
-set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
-set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
-set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
-set(CMAKE_C_COMPILER ${MINGW_TRIPLET}-gcc)
-set(CMAKE_CXX_COMPILER ${MINGW_TRIPLET}-g++)
-set(CMAKE_RC_COMPILER ${MINGW_TRIPLET}-windres)
-
-# Where is the target environment located
-set(CMAKE_FIND_ROOT_PATH "${MINGW_PREFIX_PATH}/mingw")
-
-# adjust the default behaviour of the FIND_XXX() commands:
-# search headers and libraries in the target environment, search
-# programs in the host environment
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-
-set(CROSS_TARGET ${MINGW_TRIPLET})
-
-# We need a host compiler too - assuming mildly sane Unix
-# defaults here
-set(HOST_C_COMPILER cc)
-set(HOST_EXE_LINKER ld)
-
-if (MINGW_TRIPLET MATCHES "^x86_64")
-  set(HOST_C_FLAGS)
-  set(HOST_EXE_LINKER_FLAGS)
-else()
-  # In 32 bits systems have the HOST compiler generate 32 bits binaries
-  set(HOST_C_FLAGS -m32)
-  set(HOST_EXE_LINKER_FLAGS -m32)
-endif()
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,3 +1,6 @@
+# To validate:
+#   cat codecov.yml | curl --data-binary @- https://codecov.io/validate
+
 codecov:
  notify:
    require_ci_to_pass: no
@@ -12,18 +15,13 @@ coverage:
  range: "70...100"

  status:
-    project: yes
+    project:
+      default:
+        threshold: 1
    patch:
      default:
        threshold: 1
+        only_pulls: true
    changes: no

-parsers:
-  gcov:
-    branch_detection:
-      conditional: yes
-      loop: yes
-      method: no
-      macro: no
-
 comment: off
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -20,7 +20,6 @@ endif()
 check_symbol_exists(_NSGetEnviron crt_externs.h HAVE__NSGETENVIRON)

 # Headers
-check_include_files(iconv.h HAVE_ICONV_H)
 check_include_files(langinfo.h HAVE_LANGINFO_H)
 check_include_files(locale.h HAVE_LOCALE_H)
 check_include_files(pwd.h HAVE_PWD_H)
@@ -32,7 +31,6 @@ if(NOT HAVE_SYS_WAIT_H AND UNIX)
 endif()
 check_include_files(sys/utsname.h HAVE_SYS_UTSNAME_H)
 check_include_files(termios.h HAVE_TERMIOS_H)
-check_include_files(utime.h HAVE_UTIME_H)
 check_include_files(sys/uio.h HAVE_SYS_UIO_H)

 # Functions
@@ -40,35 +38,19 @@ check_function_exists(fseeko HAVE_FSEEKO)
 check_function_exists(getpwent HAVE_GETPWENT)
 check_function_exists(getpwnam HAVE_GETPWNAM)
 check_function_exists(getpwuid HAVE_GETPWUID)
-check_function_exists(uv_translate_sys_error HAVE_UV_TRANSLATE_SYS_ERROR)
 check_function_exists(readv HAVE_READV)

 if(Iconv_FOUND)
  set(HAVE_ICONV 1)
 endif()

-if(JEMALLOC_FOUND)
-  set(HAVE_JEMALLOC 1)
-endif()
-
-check_function_exists(_putenv_s HAVE_PUTENV_S)
-if(WIN32 AND NOT HAVE_PUTENV_S)
-  message(SEND_ERROR "_putenv_s() function not found on your system.")
-endif()
 check_function_exists(opendir HAVE_OPENDIR)
 check_function_exists(readlink HAVE_READLINK)
-check_function_exists(setenv HAVE_SETENV)
-if(UNIX AND NOT HAVE_SETENV)
-  message(SEND_ERROR "setenv() function not found on your system.")
-endif()
-check_function_exists(unsetenv HAVE_UNSETENV)
 check_function_exists(setpgid HAVE_SETPGID)
 check_function_exists(setsid HAVE_SETSID)
 check_function_exists(sigaction HAVE_SIGACTION)
 check_function_exists(strcasecmp HAVE_STRCASECMP)
 check_function_exists(strncasecmp HAVE_STRNCASECMP)
-check_function_exists(utime HAVE_UTIME)
-check_function_exists(utimes HAVE_UTIMES)

 # Symbols
 check_symbol_exists(FD_CLOEXEC "fcntl.h" HAVE_FD_CLOEXEC)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -13,7 +13,6 @@
 #endif

 #define PROJECT_NAME "@PROJECT_NAME@"
-#define LOCALE_INSTALL_DIR "@CMAKE_INSTALL_FULL_LOCALEDIR@"

 #cmakedefine HAVE__NSGETENVIRON
 #cmakedefine HAVE_FD_CLOEXEC
@@ -22,19 +21,12 @@
 #cmakedefine HAVE_GETPWNAM
 #cmakedefine HAVE_GETPWUID
 #cmakedefine HAVE_ICONV
-#cmakedefine HAVE_ICONV_H
 #cmakedefine HAVE_LANGINFO_H
 #cmakedefine HAVE_LOCALE_H
 #cmakedefine HAVE_NL_LANGINFO_CODESET
 #cmakedefine HAVE_NL_MSG_CAT_CNTR
-#cmakedefine HAVE_PUTENV_S
 #cmakedefine HAVE_PWD_H
 #cmakedefine HAVE_READLINK
-#cmakedefine HAVE_UV_TRANSLATE_SYS_ERROR
-// TODO: add proper cmake check
-// #define HAVE_SELINUX 1
-#cmakedefine HAVE_SETENV
-#cmakedefine HAVE_UNSETENV
 #cmakedefine HAVE_SETPGID
 #cmakedefine HAVE_SETSID
 #cmakedefine HAVE_SIGACTION
@@ -44,9 +36,6 @@
 #cmakedefine HAVE_SYS_UTSNAME_H
 #cmakedefine HAVE_SYS_WAIT_H
 #cmakedefine HAVE_TERMIOS_H
-#cmakedefine HAVE_UTIME
-#cmakedefine HAVE_UTIME_H
-#cmakedefine HAVE_UTIMES
 #cmakedefine HAVE_WORKING_LIBINTL
 #cmakedefine HAVE_WSL
 #cmakedefine UNIX
@@ -62,7 +51,6 @@
 #cmakedefine FEAT_TUI

 #ifndef UNIT_TESTING
-#cmakedefine HAVE_JEMALLOC
 #cmakedefine LOG_LIST_ACTIONS
 #endif

@@ -71,5 +59,6 @@
 #define ENDIAN_INCLUDE_FILE <@ENDIAN_INCLUDE_FILE@>

 #cmakedefine HAVE_EXECINFO_BACKTRACE
+#cmakedefine HAVE_BUILTIN_ADD_OVERFLOW

 #endif  // AUTO_CONFIG_H
--- a/contrib/local.mk.example
+++ b/contrib/local.mk.example
@@ -7,9 +7,8 @@
 # These CFLAGS can be used in addition to those specified in CMakeLists.txt:
 # CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op"

-# By default, the jemalloc family of memory allocation functions are used.
-# Uncomment the following to instead use libc memory allocation functions.
-# CMAKE_EXTRA_FLAGS += -DENABLE_JEMALLOC=OFF
+# To turn compiler warnings into errors:
+# CMAKE_EXTRA_FLAGS += "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -Werror"

 # Sets the build type; defaults to Debug. Valid values:
 #
@@ -36,7 +35,6 @@
 # them.
 #
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_BUSTED=OFF
-# DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_JEMALLOC=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBTERMKEY=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBUV=OFF
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED_LIBVTERM=OFF
@@ -49,18 +47,6 @@
 #
 # DEPS_CMAKE_FLAGS += -DUSE_BUNDLED=OFF

-# By default, bundled libraries are statically linked to nvim.
-# This has no effect for non-bundled deps, which are always dynamically linked.
-# Uncomment these entries to instead use dynamic linking.
-#
-# CMAKE_EXTRA_FLAGS += -DLIBTERMKEY_USE_STATIC=OFF
-# CMAKE_EXTRA_FLAGS += -DLIBUNIBILIUM_USE_STATIC=OFF
-# CMAKE_EXTRA_FLAGS += -DLIBUV_USE_STATIC=OFF
-# CMAKE_EXTRA_FLAGS += -DLIBVTERM_USE_STATIC=OFF
-# CMAKE_EXTRA_FLAGS += -DLUAJIT_USE_STATIC=OFF
-# CMAKE_EXTRA_FLAGS += -DMSGPACK_USE_STATIC=OFF
-#
-#
 # .DEFAULT_GOAL := nvim
 #
 # Run doxygen over the source code.
--- a/man/nvim.1
+++ b/man/nvim.1
@@ -56,6 +56,7 @@ Reads text from standard input until
 .Dv EOF ,
 then opens a buffer with that text.
 User input is read from standard error, which should be a terminal.
+.El
 .Sh OPTIONS
 .Bl -tag -width Fl
 .It Fl t Ar tag
@@ -88,10 +89,14 @@ Ex mode, reading stdin as Ex commands.
 Ex mode, reading stdin as text.
 .Ic :help Ex-mode
 .It Fl es
-Silent/batch mode, reading stdin as Ex commands.
+Silent (non-interactive) Ex mode, reading stdin as Ex commands.
+Useful for scripting because it does NOT start a UI, unlike
+.Fl e .
 .Ic :help silent-mode
 .It Fl \&Es
-Silent/batch mode, reading stdin as text.
+Silent (non-interactive) Ex mode, reading stdin as text.
+Useful for scripting because it does NOT start a UI, unlike
+.Fl E .
 .Ic :help silent-mode
 .It Fl d
 Diff mode.
@@ -198,6 +203,8 @@ do not read or write a ShaDa file.
 Skip loading plugins.
 Implied by
 .Cm -u NONE .
+.It Fl -clean
+Skip loading plugins and shada (viminfo) file.
 .It Fl o Ns Op Ar N
 Open
 .Ar N
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -29,21 +29,16 @@ foreach(PACKAGE ${PACKAGES})
  file(GLOB "${PACKNAME}_DOC_FILES" ${PACKAGE}/doc/*.txt)
  if(${PACKNAME}_DOC_FILES)
    file(MAKE_DIRECTORY ${GENERATED_PACKAGE_DIR}/${PACKNAME})
-    add_custom_target("${PACKNAME}-tags"
+    add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
      COMMAND ${CMAKE_COMMAND} -E copy_directory
        ${PACKAGE} ${GENERATED_PACKAGE_DIR}/${PACKNAME}
      COMMAND "${PROJECT_BINARY_DIR}/bin/nvim"
        -u NONE -i NONE -e --headless -c "helptags doc" -c quit
      DEPENDS
        nvim
+        nvim_runtime_deps
      WORKING_DIRECTORY "${GENERATED_PACKAGE_DIR}/${PACKNAME}"
    )
-    add_dependencies(${PACKNAME}-tags nvim_runtime_deps)
-
-    add_custom_command(OUTPUT "${GENERATED_PACKAGE_DIR}/${PACKNAME}/doc/tags"
-      DEPENDS
-        "${PACKNAME}-tags"
-      )

    set("${PACKNAME}_DOC_NAMES")
    foreach(DF "${${PACKNAME}_DOC_FILES}")
@@ -67,7 +62,7 @@ foreach(DF ${DOCFILES})
  list(APPEND BUILDDOCFILES ${GENERATED_RUNTIME_DIR}/doc/${F})
 endforeach()

-add_custom_target(helptags
+add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
  COMMAND ${CMAKE_COMMAND} -E remove doc/*
  COMMAND ${CMAKE_COMMAND} -E copy_directory
    ${PROJECT_SOURCE_DIR}/runtime/doc doc
@@ -75,19 +70,15 @@ add_custom_target(helptags
    -u NONE -i NONE -e --headless -c "helptags ++t doc" -c quit
  DEPENDS
    nvim
+    nvim_runtime_deps
  WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}"
 )
-add_dependencies(helptags nvim_runtime_deps)

-add_custom_command(OUTPUT ${GENERATED_HELP_TAGS}
-  DEPENDS
-    helptags
-)

 add_custom_target(doc_html
  COMMAND make html
  DEPENDS
-    helptags
+    ${GENERATED_HELP_TAGS}
  WORKING_DIRECTORY "${GENERATED_RUNTIME_DIR}/doc"
 )

--- a/runtime/autoload/RstFold.vim
+++ b/runtime/autoload/RstFold.vim
@@ -1,8 +1,12 @@
 " Author: Antony Lee <anntzer.lee@gmail.com>
 " Description: Helper functions for reStructuredText syntax folding
-" Last Modified: 2018-01-07
+" Last Modified: 2018-12-29

 function s:CacheRstFold()
+  if !g:rst_fold_enabled
+    return
+  endif
+
  let closure = {'header_types': {}, 'max_level': 0, 'levels': {}}
  function closure.Process(match) dict
    let curline = getcurpos()[1]
@@ -20,12 +24,18 @@ function s:CacheRstFold()
    let self.levels[curline] = self.header_types[key]
  endfunction
  let save_cursor = getcurpos()
+  let save_mark = getpos("'[")
  silent keeppatterns %s/\v^%(%(([=`:.'"~^_*+#-])\1+\n)?.{1,2}\n([=`:.'"~^_*+#-])\2+)|%(%(([=`:.''"~^_*+#-])\3{2,}\n)?.{3,}\n([=`:.''"~^_*+#-])\4{2,})$/\=closure.Process(submatch(0))/gn
  call setpos('.', save_cursor)
+  call setpos("'[", save_mark)
  let b:RstFoldCache = closure.levels
 endfunction

 function RstFold#GetRstFold()
+  if !g:rst_fold_enabled
+    return
+  endif
+
  if !has_key(b:, 'RstFoldCache')
    call s:CacheRstFold()
  endif
@@ -37,6 +47,10 @@ function RstFold#GetRstFold()
 endfunction

 function RstFold#GetRstFoldText()
+  if !g:rst_fold_enabled
+    return
+  endif
+
  if !has_key(b:, 'RstFoldCache')
    call s:CacheRstFold()
  endif
--- a/runtime/autoload/dist/ft.vim
+++ b/runtime/autoload/dist/ft.vim
@@ -1,7 +1,7 @@
 " Vim functions for file type detection
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Dec 05
+" Last Change:	2019 Mar 08

 " These functions are moved here from runtime/filetype.vim to make startup
 " faster.
@@ -126,7 +126,7 @@ endfunc
 " This function checks if one of the first ten lines start with a '@'.  In
 " that case it is probably a change file.
 " If the first line starts with # or ! it's probably a ch file.
-" If a line has "main", "include", "//" ir "/*" it's probably ch.
+" If a line has "main", "include", "//" or "/*" it's probably ch.
 " Otherwise CHILL is assumed.
 func dist#ft#FTchange()
  let lnum = 1
@@ -197,7 +197,7 @@ func dist#ft#FTe()
    exe 'setf ' . g:filetype_euphoria
  else
    let n = 1
-    while n < 100 && n < line("$")
+    while n < 100 && n <= line("$")
      if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
 	setf specman
 	return
@@ -211,7 +211,7 @@ endfunc
 " Distinguish between HTML, XHTML and Django
 func dist#ft#FThtml()
  let n = 1
-  while n < 10 && n < line("$")
+  while n < 10 && n <= line("$")
    if getline(n) =~ '\<DTD\s\+XHTML\s'
      setf xhtml
      return
@@ -222,13 +222,13 @@ func dist#ft#FThtml()
    endif
    let n = n + 1
  endwhile
-  setf html
+  setf FALLBACK html
 endfunc

 " Distinguish between standard IDL and MS-IDL
 func dist#ft#FTidl()
  let n = 1
-  while n < 50 && n < line("$")
+  while n < 50 && n <= line("$")
    if getline(n) =~ '^\s*import\s\+"\(unknwn\|objidl\)\.idl"'
      setf msidl
      return
@@ -484,6 +484,10 @@ endfunc

 " Called from filetype.vim and scripts.vim.
 func dist#ft#SetFileTypeSH(name)
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
  if expand("<amatch>") =~ g:ft_ignore_pat
    return
  endif
@@ -531,6 +535,10 @@ endfunc
 " as used for Tcl.
 " Also called from scripts.vim, thus can't be local to this script.
 func dist#ft#SetFileTypeShell(name)
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
  if expand("<amatch>") =~ g:ft_ignore_pat
    return
  endif
@@ -551,6 +559,10 @@ func dist#ft#SetFileTypeShell(name)
 endfunc

 func dist#ft#CSH()
+  if did_filetype()
+    " Filetype was already detected
+    return
+  endif
  if exists("g:filetype_csh")
    call dist#ft#SetFileTypeShell(g:filetype_csh)
  elseif &shell =~ "tcsh"
@@ -687,7 +699,7 @@ endfunc

 func dist#ft#FTxml()
  let n = 1
-  while n < 100 && n < line("$")
+  while n < 100 && n <= line("$")
    let line = getline(n)
    " DocBook 4 or DocBook 5.
    let is_docbook4 = line =~ '<!DOCTYPE.*DocBook'
@@ -713,7 +725,7 @@ endfunc

 func dist#ft#FTy()
  let n = 1
-  while n < 100 && n < line("$")
+  while n < 100 && n <= line("$")
    let line = getline(n)
    if line =~ '^\s*%'
      setf yacc
--- a/runtime/autoload/health.vim
+++ b/runtime/autoload/health.vim
@@ -30,7 +30,7 @@ function! health#check(plugin_names) abort
        \ : s:to_fn_names(a:plugin_names)

  tabnew
-  setlocal wrap breakindent
+  setlocal wrap breakindent linebreak
  setlocal filetype=markdown
  setlocal conceallevel=2 concealcursor=nc
  setlocal keywordprg=:help
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -8,7 +8,7 @@ function! s:check_config() abort
  if !filereadable(vimrc)
    let ok = v:false
    let has_vim = filereadable(expand('~/.vimrc'))
-    call health#report_warn('Missing user config file: '.vimrc,
+    call health#report_warn((-1 == getfsize(vimrc) ? 'Missing' : 'Unreadable').' user config file: '.vimrc,
          \[ has_vim ? ':help nvim-from-vim' : ':help init.vim' ])
  endif

@@ -25,6 +25,15 @@ function! s:check_config() abort
          \   'https://github.com/neovim/neovim/wiki/Following-HEAD#20170402' ])
  endif

+  if v:ctype ==# 'C'
+    let ok = v:false
+    call health#report_error('Locale does not support UTF-8. Unicode characters may not display correctly.'
+          \                  .printf("\n$LANG=%s $LC_ALL=%s $LC_CTYPE=%s", $LANG, $LC_ALL, $LC_CTYPE),
+          \ [ 'If using tmux, try the -u option.',
+          \   'Ensure that your terminal/shell/tmux/etc inherits the environment, or set $LANG explicitly.' ,
+          \   'Configure your system locale.' ])
+  endif
+
  if &paste
    let ok = v:false
    call health#report_error("'paste' is enabled. This option is only for pasting text.\nIt should not be set in your config.",
@@ -32,6 +41,12 @@ function! s:check_config() abort
          \   'Check `:verbose set paste?` to see if a plugin or script set the option.', ])
  endif

+  let shadafile = (empty(&shadafile) || &shadafile ==# 'NONE') ? stdpath('data').'/shada/main.shada' : &shadafile
+  if !empty(shadafile) && (!filereadable(shadafile) || !filewritable(shadafile))
+    let ok = v:false
+    call health#report_error('shada file is not '.(filereadable(shadafile) ? 'writeable' : 'readable').":\n".shadafile)
+  endif
+
  if ok
    call health#report_ok('no issues found')
  endif
@@ -108,7 +123,7 @@ function! s:check_performance() abort
  else
    call health#report_info(buildtype)
    call health#report_warn(
-          \ 'Non-optimized build-type. Nvim will be slower.',
+          \ 'Non-optimized '.(has('debug')?'(DEBUG) ':'').'build. Nvim will be slower.',
          \ ['Install a different Nvim package, or rebuild with `CMAKE_BUILD_TYPE=RelWithDebInfo`.',
          \  s:suggest_faq])
  endif
@@ -161,6 +176,17 @@ function! s:check_tmux() abort
          \ ["Set default-terminal in ~/.tmux.conf:\nset-option -g default-terminal \"screen-256color\"",
          \  s:suggest_faq])
  endif
+
+  " check for RGB capabilities
+  let info = system('tmux server-info')
+  let has_tc = stridx(info, " Tc: (flag) true") != -1
+  let has_rgb = stridx(info, " RGB: (flag) true") != -1
+  if !has_tc && !has_rgb
+    call health#report_warn(
+          \ "Neither Tc nor RGB capability set. True colors are disabled. |'termguicolors'| won't work properly.",
+          \ ["Put this in your ~/.tmux.conf and replace XXX by your $TERM outside of tmux:\nset-option -sa terminal-overrides ',XXX:RGB'",
+          \  "For older tmux versions use this instead:\nset-option -ga terminal-overrides ',XXX:Tc'"])
+  endif
 endfunction

 function! s:check_terminal() abort
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -106,7 +106,8 @@ endfunction

 " Fetch the contents of a URL.
 function! s:download(url) abort
-  if executable('curl')
+  let has_curl = executable('curl')
+  if has_curl && system(['curl', '-V']) =~# 'Protocols:.*https'
    let rv = s:system(['curl', '-sL', a:url], '', 1, 1)
    return s:shell_error ? 'curl error with '.a:url.': '.s:shell_error : rv
  elseif executable('python')
@@ -124,7 +125,9 @@ function! s:download(url) abort
          \ ? 'python urllib.request error: '.s:shell_error
          \ : rv
  endif
-  return 'missing `curl` and `python`, cannot make pypi request'
+  return 'missing `curl` '
+          \ .(has_curl ? '(with HTTPS support) ' : '')
+          \ .'and `python`, cannot make web request'
 endfunction

 " Check for clipboard tools.
@@ -561,7 +564,10 @@ function! s:check_node() abort
  endif
  call health#report_info('Neovim node.js host: '. host)

-  let latest_npm_cmd = has('win32') ? 'cmd /c npm info neovim --json' : 'npm info neovim --json'
+  let manager = executable('npm') ? 'npm' : 'yarn'
+  let latest_npm_cmd = has('win32') ?
+        \ 'cmd /c '. manager .' info neovim --json' :
+        \ manager .' info neovim --json'
  let latest_npm = s:system(split(latest_npm_cmd))
  if s:shell_error || empty(latest_npm)
    call health#report_error('Failed to run: '. latest_npm_cmd,
@@ -590,7 +596,8 @@ function! s:check_node() abort
    call health#report_warn(
          \ printf('Package "neovim" is out-of-date. Installed: %s, latest: %s',
          \ current_npm, latest_npm),
-          \ ['Run in shell: npm install -g neovim'])
+          \ ['Run in shell: npm install -g neovim',
+          \  'Run in shell (if you use yarn): yarn global add neovim'])
  else
    call health#report_ok('Latest "neovim" npm/yarn package is installed: '. current_npm)
  endif
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -150,8 +150,9 @@ endfunction

 function! s:get_page(path) abort
  " Disable hard-wrap by using a big $MANWIDTH (max 1000 on some systems #9065).
-  " We use soft wrap: ftplugin/man.vim sets wrap/breakindent/….
-  let manwidth = 999
+  " Soft-wrap: ftplugin/man.vim sets wrap/breakindent/….
+  " Hard-wrap: driven by `man`.
+  let manwidth = !get(g:,'man_hardwrap') ? 999 : (empty($MANWIDTH) ? winwidth(0) : $MANWIDTH)
  " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db).
  " http://comments.gmane.org/gmane.editors.vim.devel/29085
  " Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
--- a/runtime/autoload/netrwSettings.vim
+++ b/runtime/autoload/netrwSettings.vim
@@ -1,7 +1,7 @@
 " netrwSettings.vim: makes netrw settings simpler
-" Date:		Dec 30, 2014
+" Date:		Nov 09, 2016
 " Maintainer:	Charles E Campbell <drchipNOSPAM at campbellfamily dot biz>
-" Version:	15
+" Version:	16
 " Copyright:    Copyright (C) 1999-2007 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
@@ -19,7 +19,7 @@
 if exists("g:loaded_netrwSettings") || &cp
  finish
 endif
-let g:loaded_netrwSettings = "v15"
+let g:loaded_netrwSettings = "v16"
 if v:version < 700
 echohl WarningMsg
 echo "***warning*** this version of netrwSettings needs vim 7.0"
@@ -154,9 +154,13 @@ fun! netrwSettings#NetrwSettings()
  put = 'let g:netrw_list_hide         = '.g:netrw_list_hide
  put = 'let g:netrw_liststyle         = '.g:netrw_liststyle
  put = 'let g:netrw_localcopycmd      = '.g:netrw_localcopycmd
+  put = 'let g:netrw_localcopycmdopt   = '.g:netrw_localcopycmdopt
  put = 'let g:netrw_localmkdir        = '.g:netrw_localmkdir
+  put = 'let g:netrw_localmkdiropt     = '.g:netrw_localmkdiropt
  put = 'let g:netrw_localmovecmd      = '.g:netrw_localmovecmd
+  put = 'let g:netrw_localmovecmdopt   = '.g:netrw_localmovecmdopt
  put = 'let g:netrw_localrmdir        = '.g:netrw_localrmdir
+  put = 'let g:netrw_localrmdiropt     = '.g:netrw_localrmdiropt
  put = 'let g:netrw_maxfilenamelen    = '.g:netrw_maxfilenamelen
  put = 'let g:netrw_menu              = '.g:netrw_menu
  put = 'let g:netrw_mousemaps         = '.g:netrw_mousemaps
--- a/runtime/autoload/paste.vim
+++ b/runtime/autoload/paste.vim
@@ -1,15 +1,10 @@
 " Vim support file to help with paste mappings and menus
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2017 Aug 30
+" Last Change:	2019 Jan 27

 " Define the string to use for items that are present both in Edit, Popup and
 " Toolbar menu.  Also used in mswin.vim and macmap.vim.

-" Pasting blockwise and linewise selections is not possible in Insert and
-" Visual mode without the +virtualedit feature.  They are pasted as if they
-" were characterwise instead.  Add to that some tricks to leave the cursor in
-" the right position, also for "gi".
-if has("virtualedit")
 let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
 let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
 let paste#paste_cmd['i'] = "\<c-\>\<c-o>\"+gP"
@@ -28,8 +23,3 @@ if has("virtualedit")
  endif
  let &ve = ove
 endfunc
-else
-  let paste#paste_cmd = {'n': "\"=@+.'xy'<CR>gPFx\"_2x"}
-  let paste#paste_cmd['v'] = '"-c<Esc>gix<Esc>' . paste#paste_cmd['n'] . '"_x'
-  let paste#paste_cmd['i'] = 'x<Esc>' . paste#paste_cmd['n'] . '"_s'
-endif
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -1,6 +1,16 @@
 " The clipboard provider uses shell commands to communicate with the clipboard.
 " The provider function will only be registered if a supported command is
 " available.
+
+if exists('g:loaded_clipboard_provider')
+  finish
+endif
+" Default to 1.  provider#clipboard#Executable() may set 2.
+" To force a reload:
+"   :unlet g:loaded_clipboard_provider
+"   :runtime autoload/provider/clipboard.vim
+let g:loaded_clipboard_provider = 1
+
 let s:copy = {}
 let s:paste = {}
 let s:clipboard = {}
@@ -65,7 +75,7 @@ function! provider#clipboard#Executable() abort
    let s:paste = get(g:clipboard, 'paste', { '+': v:null, '*': v:null })
    let s:cache_enabled = get(g:clipboard, 'cache_enabled', 0)
    return get(g:clipboard, 'name', 'g:clipboard')
-  elseif has('mac') && executable('pbpaste') && s:cmd_ok('pbpaste')
+  elseif has('mac')
    let s:copy['+'] = 'pbcopy'
    let s:paste['+'] = 'pbpaste'
    let s:copy['*'] = s:copy['+']
@@ -73,9 +83,9 @@ function! provider#clipboard#Executable() abort
    let s:cache_enabled = 0
    return 'pbcopy'
  elseif exists('$WAYLAND_DISPLAY') && executable('wl-copy') && executable('wl-paste')
-    let s:copy['+'] = 'wl-copy --foreground'
+    let s:copy['+'] = 'wl-copy --foreground --type text/plain'
    let s:paste['+'] = 'wl-paste --no-newline'
-    let s:copy['*'] = 'wl-copy --foreground --primary'
+    let s:copy['*'] = 'wl-copy --foreground --primary --type text/plain'
    let s:paste['*'] = 'wl-paste --no-newline --primary'
    return 'wl-copy'
  elseif exists('$DISPLAY') && executable('xclip')
@@ -120,13 +130,6 @@ function! provider#clipboard#Executable() abort
  return ''
 endfunction

-if empty(provider#clipboard#Executable())
-  " provider#clipboard#Call() *must not* be defined if the provider is broken.
-  " Otherwise eval_has_provider() thinks the clipboard provider is
-  " functioning, and eval_call_provider() will happily call it.
-  finish
-endif
-
 function! s:clipboard.get(reg) abort
  if type(s:paste[a:reg]) == v:t_func
    return s:paste[a:reg]()
@@ -156,9 +159,7 @@ function! s:clipboard.set(lines, regtype, reg) abort
  end

  if s:selections[a:reg].owner > 0
-    " The previous provider instance should exit when the new one takes
-    " ownership, but kill it to be sure we don't fill up the job table.
-    call jobstop(s:selections[a:reg].owner)
+    let prev_job = s:selections[a:reg].owner
  end
  let s:selections[a:reg] = copy(s:selection)
  let selection = s:selections[a:reg]
@@ -172,13 +173,23 @@ function! s:clipboard.set(lines, regtype, reg) abort
    call jobsend(jobid, a:lines)
    call jobclose(jobid, 'stdin')
    let selection.owner = jobid
+    let ret = 1
  else
    echohl WarningMsg
    echomsg 'clipboard: failed to execute: '.(s:copy[a:reg])
    echohl None
-    return 0
+    let ret = 1
  endif
-  return 1
+
+  " The previous provider instance should exit when the new one takes
+  " ownership, but kill it to be sure we don't fill up the job table.
+  if exists('prev_job')
+    call timer_start(1000, {... ->
+          \ jobwait([prev_job], 0)[0] == -1
+          \ && jobstop(prev_job)})
+  endif
+
+  return ret
 endfunction

 function! provider#clipboard#Call(method, args) abort
@@ -192,3 +203,6 @@ function! provider#clipboard#Call(method, args) abort
    let s:here = v:false
  endtry
 endfunction
+
+" eval_has_provider() decides based on this variable.
+let g:loaded_clipboard_provider = empty(provider#clipboard#Executable()) ? 1 : 2
--- a/runtime/autoload/provider/node.vim
+++ b/runtime/autoload/provider/node.vim
@@ -140,8 +140,9 @@ endfunction

 let s:err = ''
 let s:prog = provider#node#Detect()
+let g:loaded_node_provider = empty(s:prog) ? 1 : 2

-if empty(s:prog)
+if g:loaded_node_provider != 2
  let s:err = 'Cannot find the "neovim" node package. Try :checkhealth'
 endif

--- a/runtime/autoload/provider/python.vim
+++ b/runtime/autoload/provider/python.vim
@@ -7,9 +7,8 @@
 if exists('g:loaded_python_provider')
  finish
 endif
-let g:loaded_python_provider = 1
-
 let [s:prog, s:err] = provider#pythonx#Detect(2)
+let g:loaded_python_provider = empty(s:prog) ? 1 : 2

 function! provider#python#Prog() abort
  return s:prog
@@ -19,11 +18,6 @@ function! provider#python#Error() abort
  return s:err
 endfunction

-if s:prog == ''
-  " Detection failed
-  finish
-endif
-
 " The Python provider plugin will run in a separate instance of the Python
 " host.
 call remote#host#RegisterClone('legacy-python-provider', 'python')
--- a/runtime/autoload/provider/python3.vim
+++ b/runtime/autoload/provider/python3.vim
@@ -7,9 +7,8 @@
 if exists('g:loaded_python3_provider')
  finish
 endif
-let g:loaded_python3_provider = 1
-
 let [s:prog, s:err] = provider#pythonx#Detect(3)
+let g:loaded_python3_provider = empty(s:prog) ? 1 : 2

 function! provider#python3#Prog() abort
  return s:prog
@@ -19,11 +18,6 @@ function! provider#python3#Error() abort
  return s:err
 endfunction

-if s:prog == ''
-  " Detection failed
-  finish
-endif
-
 " The Python3 provider plugin will run in a separate instance of the Python3
 " host.
 call remote#host#RegisterClone('legacy-python3-provider', 'python3')
--- a/runtime/autoload/provider/ruby.vim
+++ b/runtime/autoload/provider/ruby.vim
@@ -62,8 +62,9 @@ endfunction
 let s:err = ''
 let s:prog = s:detect()
 let s:plugin_path = expand('<sfile>:p:h') . '/script_host.rb'
+let g:loaded_ruby_provider = empty(s:prog) ? 1 : 2

-if empty(s:prog)
+if g:loaded_ruby_provider != 2
  let s:err = 'Cannot find the neovim RubyGem. Try :checkhealth'
 endif

--- a/runtime/autoload/python3complete.vim
+++ b/runtime/autoload/python3complete.vim
@@ -44,7 +44,7 @@
 "

 if !has('python3')
-    echo "Error: Required vim compiled with +python3"
+    echo 'Error: Requires python3 + pynvim.  :help provider-python'
    finish
 endif

--- a/runtime/autoload/pythoncomplete.vim
+++ b/runtime/autoload/pythoncomplete.vim
@@ -42,7 +42,7 @@
 "

 if !has('python')
-    echo "Error: Required vim compiled with +python"
+    echo 'Error: Requires python + pynvim.  :help provider-python'
    finish
 endif

--- a/runtime/autoload/remote/host.vim
+++ b/runtime/autoload/remote/host.vim
@@ -147,7 +147,7 @@ function! s:RegistrationCommands(host) abort
        \ a:host, string(map(registered, "fnamemodify(v:val, ':t')")))

  " Delete the temporary host clone
-  call rpcstop(s:hosts[host_id].channel)
+  call jobstop(s:hosts[host_id].channel)
  call remove(s:hosts, host_id)
  call remove(s:plugins_for_host, host_id)
  return lines
--- a/runtime/autoload/rubycomplete.vim
+++ b/runtime/autoload/rubycomplete.vim
@@ -3,7 +3,7 @@
 " Maintainer:		Mark Guzman <segfault@hasno.info>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" Maintainer Version:   0.8.1
+" Last Change:		2019 Jan 06
 " ----------------------------------------------------------------------------
 "
 " Ruby IRB/Complete author: Keiju ISHITSUKA(keiju@ishitsuka.com)
@@ -103,7 +103,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
    endif

    let curpos = getpos(".")
-    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'wr' )
+    let [enum,ecol] = searchpairpos( crex, '', '\(end\|}\)', 'W' )
    call cursor(lastpos[1], lastpos[2])

    if lnum > enum
@@ -253,15 +253,27 @@ class VimRubyCompletion

 # {{{ buffer analysis magic
  def load_requires
+
+    custom_paths = VIM::evaluate("get(g:, 'rubycomplete_load_paths', [])")
+
+    if !custom_paths.empty?
+      $LOAD_PATH.concat(custom_paths).uniq!
+    end
+
    buf = VIM::Buffer.current
    enum = buf.line_number
    nums = Range.new( 1, enum )
    nums.each do |x|
+
      ln = buf[x]
      begin
-        eval( "require %s" % $1 ) if /.*require\s*(.*)$/.match( ln )
-      rescue Exception
-        #ignore?
+        if /.*require_relative\s*(.*)$/.match( ln )
+          eval( "require %s" % File.expand_path($1) )
+        elsif /.*require\s*(["'].*?["'])/.match( ln )
+          eval( "require %s" % $1 )
+        end
+      rescue Exception => e
+        dprint e.inspect
      end
    end
  end
@@ -344,8 +356,13 @@ class VimRubyCompletion
        if x != cur_line
          next if x == 0
          ln = buf[x]
-          if /^\s*(module|class|def|include)\s+/.match(ln)
-            clscnt += 1 if $1 == "class"
+          is_const = false
+          if /^\s*(module|class|def|include)\s+/.match(ln) || is_const = /^\s*?[A-Z]([A-z]|[1-9])*\s*?[|]{0,2}=\s*?.+\s*?/.match(ln)
+            clscnt += 1 if /class|module/.match($1)
+            # We must make sure to load each constant only once to avoid errors
+            if is_const
+                ln.gsub!(/\s*?[|]{0,2}=\s*?/, '||=')
+            end
            #dprint "\$1$1
            classdef += "%s\n" % ln
            classdef += "end\n" if /def\s+/.match(ln)
@@ -423,7 +440,6 @@ class VimRubyCompletion
    return get_buffer_entity_list( "class" )
  end

-
  def load_rails
    allow_rails = VIM::evaluate("exists('g:rubycomplete_rails') && g:rubycomplete_rails")
    return if allow_rails.to_i.zero?
@@ -529,7 +545,6 @@ class VimRubyCompletion
        ret += ActiveRecord::ConnectionAdapters::SchemaStatements.methods
    end

-
    return ret
  end

@@ -587,13 +602,15 @@ class VimRubyCompletion
 # {{{ main completion code
  def self.preload_rails
    a = VimRubyCompletion.new
-    require 'Thread'
+    if VIM::evaluate("has('nvim')") == 0
+      require 'thread'
      Thread.new(a) do |b|
        begin
        b.load_rails
        rescue
        end
      end
+    end
    a.load_rails
  rescue
  end
@@ -613,7 +630,6 @@ class VimRubyCompletion
    want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
    load_gems unless want_gems.to_i.zero?

-
    input = VIM::Buffer.current.line
    cpos = VIM::Window.current.cursor[1] - 1
    input = input[0..cpos]
@@ -666,6 +682,7 @@ class VimRubyCompletion
        message = Regexp.quote($4)
        dprint "const or cls 2 [recv: \'%s\', msg: \'%s\']" % [ receiver, message ]
        load_buffer_class( receiver )
+        load_buffer_module( receiver )
        begin
          classes = eval("#{receiver}.constants")
          #methods = eval("#{receiver}.methods")
@@ -786,7 +803,6 @@ class VimRubyCompletion
      methods += Kernel.public_methods
    end

-
    include_object = VIM::evaluate("exists('g:rubycomplete_include_object') && g:rubycomplete_include_object")
    methods = clean_sel( methods, message )
    methods = (methods-Object.instance_methods) if include_object == "0"
@@ -829,5 +845,4 @@ let s:rubycomplete_rails_loaded = 0
 call s:DefRuby()
 "}}} ruby-side code

-
 " vim:tw=78:sw=4:ts=8:et:fdm=marker:ft=vim:norl:
--- a/runtime/autoload/spellfile.vim
+++ b/runtime/autoload/spellfile.vim
@@ -195,16 +195,6 @@ function! spellfile#GetDirChoices()
 endfunc

 function! spellfile#WritableSpellDir()
-  " Always use the $XDG_DATA_HOME/nvim/site directory
-  if exists('$XDG_DATA_HOME')
-    return $XDG_DATA_HOME . "/nvim/site/spell"
-  elseif !(has('win32') || has('win64'))
-    return $HOME . "/.local/share/nvim/site/spell"
-  endif
-  for dir in split(&rtp, ',')
-    if filewritable(dir) == 2
-      return dir . "/spell"
-    endif
-  endfor
-  return ''
+  " Always use the $XDG_DATA_HOME/…/site directory
+  return stdpath('data').'/site/spell'
 endfunction
--- a/runtime/autoload/syntaxcomplete.vim
+++ b/runtime/autoload/syntaxcomplete.vim
@@ -2,7 +2,7 @@
 " Language:    All languages, uses existing syntax highlighting rules
 " Maintainer:  David Fishburn <dfishburn dot vim at gmail dot com>
 " Version:     13.0
-" Last Change: 2013 May 14
+" Last Change: 2019 Aug 08
 " Usage:       For detailed help, ":help ft-syntax-omni"

 " History
@@ -597,7 +597,7 @@ function! s:SyntaxCSyntaxGroupItems( group_name, syntax_full )
                " Remove all non-word characters
                " let syn_list = substitute( syn_list, '\<match /\zs.\{-}\<\W\+\>.\{-}\ze\/ ', "", 'g' )
                " let syn_list = substitute( syn_list, '\%(\<match \/[^/]\{-}\)\@<=\W\+\ze.\{-}\/ ', ' ', 'g' )
-                " Do this by using the outer substitue() call to gather all
+                " Do this by using the outer substitute() call to gather all
                " text between the match /.../ tags.
                " The inner substitute() call operates on the text selected
                " and replaces all non-word characters.
--- a/runtime/autoload/tohtml.vim
+++ b/runtime/autoload/tohtml.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for the tohtml plugin.
 " Maintainer: Ben Fritz <fritzophrenic@gmail.com>
-" Last Change: 2013 Sep 03
+" Last Change: 2018 Nov 11
 "
 " Additional contributors:
 "
@@ -544,12 +544,16 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
    " add required javascript in reverse order so we can just call append again
    " and again without adjusting {{{

-    " insert script closing tag
+    let s:uses_script = s:settings.dynamic_folds || s:settings.line_ids || !empty(s:settings.prevent_copy)
+
+    " insert script closing tag if needed
+    if s:uses_script
      call append(style_start, [
 	    \ '',
 	    \ s:settings.use_xhtml ? '//]]>' : '-->',
 	    \ "</script>"
 	    \ ])
+    endif

    " insert script which corrects the size of small input elements in
    " prevent_copy mode. See 2html.vim for details on why this is needed and how
@@ -575,9 +579,10 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ '}'
 	    \ ])
    endif
-    "
+
    " insert javascript to get IDs from line numbers, and to open a fold before
    " jumping to any lines contained therein
+    if s:settings.line_ids
      call append(style_start, [
 	    \ "  /* Always jump to new location even if the line was hidden inside a fold, or",
 	    \ "   * we corrected the raw number to a line ID.",
@@ -591,6 +596,7 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ "  window.onhashchange = JumpToLine;",
 	    \ "}"
 	    \ ])
+
      if s:settings.dynamic_folds
 	call append(style_start, [
 	      \ "",
@@ -607,6 +613,9 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	      \ "  }",
 	      \ ])
      endif
+    endif
+
+    if s:settings.line_ids
      call append(style_start, [
 	    \ "",
 	    \ "/* function to open any folds containing a jumped-to line before jumping to it */",
@@ -622,8 +631,9 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ "  if (lineNum.indexOf('W') == -1) {",
 	    \ "    lineNum = 'W1'+lineNum;",
 	    \ "  }",
-	  \ "  lineElem = document.getElementById(lineNum);"
+	    \ "  var lineElem = document.getElementById(lineNum);"
 	    \ ])
+    endif

    " Insert javascript to toggle matching folds open and closed in all windows,
    " if dynamic folding is active.
@@ -648,11 +658,13 @@ func! tohtml#Diff2HTML(win_list, buf_list) "{{{
 	    \ ])
    endif

+    if s:uses_script
      " insert script tag; javascript is always needed for the line number
      " normalization for URL hashes
      call append(style_start, [
 	    \ "<script type='text/javascript'>",
 	    \ s:settings.use_xhtml ? '//<![CDATA[' : "<!--"])
+    endif

    " Insert styles from all the generated html documents and additional styles
    " for the table-based layout of the side-by-side diff. The diff should take
@@ -767,7 +779,7 @@ func! tohtml#GetUserSettings() "{{{
    if user_settings.no_pre == 0
      call tohtml#GetOption(user_settings,
 	    \ 'expand_tabs',
-	    \ &expandtab || &ts != 8 || user_settings.number_lines ||
+	    \ &expandtab || &ts != 8 || (exists("+vts") && &vts != '') || user_settings.number_lines ||
 	    \   (user_settings.dynamic_folds && !user_settings.no_foldcolumn))
    else
      let user_settings.expand_tabs = 1
--- a/runtime/autoload/xmlformat.vim
+++ b/runtime/autoload/xmlformat.vim
@@ -1,5 +1,5 @@
 " Vim plugin for formatting XML
-" Last Change: Thu, 22 May 2018 21:26:55 +0100
+" Last Change: Thu, 07 Dec 2018
 "     Version: 0.1
 "      Author: Christian Brabandt <cb@256bit.org>
 "  Repository: https://github.com/chrisbra/vim-xml-ftplugin
@@ -85,7 +85,11 @@ func! s:Trim(item)
 endfunc
 " Check if tag is a new opening tag <tag> {{{1
 func! s:StartTag(tag)
-  return a:tag =~? '^\s*<[^/?]'
+  let is_comment = s:IsComment(a:tag)
+  return a:tag =~? '^\s*<[^/?]' && !is_comment
+endfunc
+func! s:IsComment(tag)
+  return a:tag =~? '<!--'
 endfunc
 " Remove one level of indentation {{{1
 func! s:DecreaseIndent()
--- a/runtime/bugreport.vim
+++ b/runtime/bugreport.vim
@@ -2,7 +2,7 @@
 :" information about the environment of a possible bug in Vim.
 :"
 :" Maintainer:	Bram Moolenaar <Bram@vim.org>
-:" Last change:	2005 Jun 12
+:" Last change:	2019 Jan 27
 :"
 :" To use inside Vim:
 :"	:so $VIMRUNTIME/bugreport.vim
--- a/runtime/compiler/cs.vim
+++ b/runtime/compiler/cs.vim
@@ -1,8 +1,8 @@
 " Vim compiler file
 " Compiler:               Microsoft Visual Studio C#
-" Maintainer:	Zhou YiChao (broken.zhou@gmail.com)
+" Maintainer:             Yichao Zhou (broken.zhou@gmail.com)
 " Previous Maintainer:    Joseph H. Yao (hyao@sina.com)
-" Last Change:	2012 Apr 30
+" Last Change:            Jul 22, 2019

 if exists("current_compiler")
  finish
@@ -20,7 +20,7 @@ CompilerSet errorformat+=%f(%l\\,%v):\ %t%*[^:]:\ %m,
            \%trror%*[^:]:\ %m,
            \%tarning%*[^:]:\ %m

-CompilerSet makeprg=csc\ %
+CompilerSet makeprg=csc\ %:S

 let &cpo = s:keepcpo
 unlet s:keepcpo
--- a/runtime/compiler/erlang.vim
+++ b/runtime/compiler/erlang.vim
@@ -1,13 +1,13 @@
 " Vim compiler file
 " Compiler:     Erlang
 " Maintainer:	Dmitry Vasiliev <dima at hlabs dot org>
-" Last Change:	2012-02-13
+" Last Change:	2019 Jul 23

 if exists("current_compiler")
  finish
 endif
 let current_compiler = "erlang"

-CompilerSet makeprg=erlc\ -Wall\ %
+CompilerSet makeprg=erlc\ -Wall\ %:S

 CompilerSet errorformat=%f:%l:\ %m
--- a/runtime/compiler/eruby.vim
+++ b/runtime/compiler/eruby.vim
@@ -3,6 +3,7 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:		2018 Jan 25

 if exists("current_compiler")
  finish
@@ -28,8 +29,8 @@ CompilerSet errorformat=
    \%W%f:%l:\ warning:\ %m,
    \%E%f:%l:in\ %*[^:]:\ %m,
    \%E%f:%l:\ %m,
-    \%-C%\tfrom\ %f:%l:in\ %.%#,
-    \%-Z%\tfrom\ %f:%l,
+    \%-C%\t%\\d%#:%#\ %#from\ %f:%l:in\ %.%#,
+    \%-Z%\t%\\d%#:%#\ %#from\ %f:%l,
    \%-Z%p^,
    \%-G%.%#

--- a/runtime/compiler/fortran_cv.vim
+++ b/runtime/compiler/fortran_cv.vim
@@ -22,7 +22,7 @@ CompilerSet errorformat=
 		\%-Z%p%^%.%#,
 		\%-G%.%#,
 " Compiler call
-CompilerSet makeprg=df\ /nologo\ /noobj\ /c\ %
+CompilerSet makeprg=df\ /nologo\ /noobj\ /c\ %:S
 " Visual fortran defaults to printing output on stderr
 " Adjust option shellpipe accordingly

--- a/runtime/compiler/gcc.vim
+++ b/runtime/compiler/gcc.vim
@@ -2,6 +2,8 @@
 " Compiler:             GNU C Compiler
 " Previous Maintainer:  Nikolai Weibull <now@bitwi.se>
 " Latest Revision:      2010-10-14
+" 			changed pattern for entering/leaving directories
+" 			by Daniel Hahler, 2019 Jul 12
 " 			added line suggested by Anton Lindqvist 2016 Mar 31

 if exists("current_compiler")
@@ -27,10 +29,10 @@ CompilerSet errorformat=
      \%f:%l:\ %m,
      \%f:\\(%*[^\\)]\\):\ %m,
      \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m,
-      \%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f',
-      \%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f',
-      \%D%*\\a:\ Entering\ directory\ [`']%f',
-      \%X%*\\a:\ Leaving\ directory\ [`']%f',
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ %*[`']%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ %*[`']%f',
+      \%D%*\\a:\ Entering\ directory\ %*[`']%f',
+      \%X%*\\a:\ Leaving\ directory\ %*[`']%f',
      \%DMaking\ %*\\a\ in\ %f

 if exists('g:compiler_gcc_ignore_unmatched_lines')
--- a/runtime/compiler/jikes.vim
+++ b/runtime/compiler/jikes.vim
@@ -1,7 +1,7 @@
 " Vim Compiler File
 " Compiler:	Jikes
 " Maintainer:	Dan Sharp <dwsharp at hotmail dot com>
-" Last Change:	20 Jan 2009
+" Last Change:	2019 Jul 23
 " URL:		http://dwsharp.users.sourceforge.net/vim/compiler

 if exists("current_compiler")
@@ -14,5 +14,5 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
 endif

 " Jikes defaults to printing output on stderr
-CompilerSet makeprg=jikes\ -Xstdout\ +E\ \"%\"
+CompilerSet makeprg=jikes\ -Xstdout\ +E\ \"%:S\"
 CompilerSet errorformat=%f:%l:%v:%*\\d:%*\\d:%*\\s%m
--- a/runtime/compiler/ocaml.vim
+++ b/runtime/compiler/ocaml.vim
@@ -1,7 +1,11 @@
 " Vim Compiler File
 " Compiler:    ocaml
-" Maintainer:	See ftplugin/ocaml.vim (?)
-" Last Change:	June 2013 by Marc Weber
+" Maintainer:  Markus Mottl <markus.mottl@gmail.com>
+" URL:         https://github.com/rgrinberg/vim-ocaml
+" Last Change:
+"              2017 Nov 26 - Improved error format (Markus Mottl)
+"              2013 Aug 27 - Added a new OCaml error format (Markus Mottl)
+"              2013 Jun 30 - Initial version (Marc Weber)
 "
 " Marc Weber's comments:
 " Setting makeprg doesn't make sense, because there is ocamlc, ocamlopt,
@@ -17,7 +21,6 @@
 "
 " So having it here makes people opt-in

-
 if exists("current_compiler")
    finish
 endif
@@ -28,6 +31,7 @@ set cpo&vim

 CompilerSet errorformat =
      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d:,
+      \%EFile\ \"%f\"\\,\ line\ %l\\,\ characters\ %c-%*\\d\ %.%#,
      \%EFile\ \"%f\"\\,\ line\ %l\\,\ character\ %c:%m,
      \%+EReference\ to\ unbound\ regexp\ name\ %m,
      \%Eocamlyacc:\ e\ -\ line\ %l\ of\ \"%f\"\\,\ %m,
@@ -38,6 +42,12 @@ CompilerSet errorformat =
      \%X%*\\a[%*\\d]:\ Leaving\ directory\ `%f',
      \%D%*\\a:\ Entering\ directory\ `%f',
      \%X%*\\a:\ Leaving\ directory\ `%f',
+      \%D%*\\a[%*\\d]:\ Entering\ directory\ '%f',
+      \%X%*\\a[%*\\d]:\ Leaving\ directory\ '%f',
+      \%D%*\\a:\ Entering\ directory\ '%f',
+      \%X%*\\a:\ Leaving\ directory\ '%f',
+      \%DEntering\ directory\ '%f',
+      \%XLeaving\ directory\ '%f',
      \%DMaking\ %*\\a\ in\ %f

 let &cpo = s:cpo_save
--- a/runtime/compiler/onsgmls.vim
+++ b/runtime/compiler/onsgmls.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	onsgmls
 " Maintainer:	Robert Rowsome <rowsome@wam.umd.edu>
-" Last Change:	2004 Mar 27
+" Last Change:	2019 Jul 23

 if exists("current_compiler")
  finish
@@ -15,7 +15,7 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C

-CompilerSet makeprg=onsgmls\ -s\ %
+CompilerSet makeprg=onsgmls\ -s\ %:S

 CompilerSet errorformat=onsgmls:%f:%l:%c:%t:%m,
 		    \onsgmls:%f:%l:%c:%m
--- a/runtime/compiler/perl.vim
+++ b/runtime/compiler/perl.vim
@@ -1,7 +1,7 @@
 " Vim Compiler File
 " Compiler:     Perl syntax checks (perl -Wc)
 " Maintainer:   Christian J. Robinson <heptite@gmail.com>
-" Last Change:  2006 Aug 13
+" Last Change:  2019 Jul 22

 if exists("current_compiler")
  finish
@@ -27,7 +27,7 @@ else
 	let s:taintopt = ''
 endif

-exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %'
+exe 'CompilerSet makeprg=perl\ -' . s:warnopt . s:taintopt . 'c\ %:S'

 CompilerSet errorformat=
 	\%-G%.%#had\ compilation\ errors.,
--- a/runtime/compiler/rake.vim
+++ b/runtime/compiler/rake.vim
@@ -3,6 +3,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:		2018 Mar 02

 if exists("current_compiler")
  finish
@@ -20,12 +21,12 @@ CompilerSet makeprg=rake

 CompilerSet errorformat=
      \%D(in\ %f),
-      \%\\s%#from\ %f:%l:%m,
-      \%\\s%#from\ %f:%l:,
-      \%\\s%##\ %f:%l:%m,
-      \%\\s%##\ %f:%l,
-      \%\\s%#[%f:%l:\ %#%m,
-      \%\\s%#%f:%l:\ %#%m,
+      \%\\s%#%\\d%#:%#\ %#from\ %f:%l:%m,
+      \%\\s%#%\\d%#:%#\ %#from\ %f:%l:,
+      \%\\s%##\ %f:%l:%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
+      \%\\s%##\ %f:%l%\\&%.%#%\\D:%\\d%\\+,
+      \%\\s%#[%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
+      \%\\s%#%f:%l:\ %#%m%\\&%.%#%\\D:%\\d%\\+:%.%#,
      \%\\s%#%f:%l:,
      \%m\ [%f:%l]:,
      \%+Erake\ aborted!,
--- a/runtime/compiler/rspec.vim
+++ b/runtime/compiler/rspec.vim
@@ -3,6 +3,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:		2018 Aug 07

 if exists("current_compiler")
  finish
@@ -23,7 +24,8 @@ CompilerSet errorformat=
    \%E%.%#:in\ `load':\ %f:%l:%m,
    \%E%f:%l:in\ `%*[^']':\ %m,
    \%-Z\ \ \ \ \ %\\+\#\ %f:%l:%.%#,
-    \%E\ \ %\\d%\\+)%.%#,
+    \%E\ \ \ \ \ Failure/Error:\ %m,
+    \%E\ \ \ \ \ Failure/Error:,
    \%C\ \ \ \ \ %m,
    \%C%\\s%#,
    \%-G%.%#
--- a/runtime/compiler/ruby.vim
+++ b/runtime/compiler/ruby.vim
@@ -4,7 +4,7 @@
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
-" ----------------------------------------------------------------------------
+" Last Change:		2019 Jan 06

 if exists("current_compiler")
  finish
@@ -21,21 +21,21 @@ set cpo-=C
 " default settings runs script normally
 " add '-c' switch to run syntax check only:
 "
-"   CompilerSet makeprg=ruby\ -wc\ $*
+"   CompilerSet makeprg=ruby\ -c
 "
 " or add '-c' at :make command line:
 "
 "   :make -c %<CR>
 "
-CompilerSet makeprg=ruby\ -w\ $*
+CompilerSet makeprg=ruby

 CompilerSet errorformat=
    \%+E%f:%l:\ parse\ error,
    \%W%f:%l:\ warning:\ %m,
    \%E%f:%l:in\ %*[^:]:\ %m,
    \%E%f:%l:\ %m,
-    \%-C%\tfrom\ %f:%l:in\ %.%#,
-    \%-Z%\tfrom\ %f:%l,
+    \%-C%\t%\\d%#:%#\ %#from\ %f:%l:in\ %.%#,
+    \%-Z%\t%\\d%#:%#\ %#from\ %f:%l,
    \%-Z%p^,
    \%-G%.%#

--- a/runtime/compiler/rubyunit.vim
+++ b/runtime/compiler/rubyunit.vim
@@ -3,6 +3,7 @@
 " Maintainer:		Doug Kearns <dougkearns@gmail.com>
 " URL:			https://github.com/vim-ruby/vim-ruby
 " Release Coordinator:	Doug Kearns <dougkearns@gmail.com>
+" Last Change:		2014 Mar 23

 if exists("current_compiler")
  finish
--- a/runtime/compiler/rustc.vim
+++ b/runtime/compiler/rustc.vim
@@ -19,7 +19,7 @@ endif
 if exists("g:rustc_makeprg_no_percent") && g:rustc_makeprg_no_percent != 0
 	CompilerSet makeprg=rustc
 else
-	CompilerSet makeprg=rustc\ \%
+	CompilerSet makeprg=rustc\ \%:S
 endif

 " Old errorformat (before nightly 2016/08/10)
--- a/runtime/compiler/splint.vim
+++ b/runtime/compiler/splint.vim
@@ -2,7 +2,7 @@
 " Compiler:     splint/lclint (C source code checker)
 " Maintainer:   Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 " Splint Home:	http://www.splint.org/
-" Last Change:  2005 Apr 21
+" Last Change:  2019 Jul 23
 " $Revision: 1.3 $

 if exists("current_compiler")
@@ -19,7 +19,7 @@ set cpo-=C

 " adapt this if you want to check more than one file at a time.
 " put command line options in .splintrc or ~/.splintrc
-CompilerSet makeprg=splint\ %
+CompilerSet makeprg=splint\ %:S

 " Note: when using the new array bounds checking flags:  Each warning
 " usually has several lines and several references to source code mostly
--- a/runtime/compiler/xmlwf.vim
+++ b/runtime/compiler/xmlwf.vim
@@ -1,7 +1,7 @@
 " Vim Compiler File
 " Compiler:	xmlwf
 " Maintainer:	Robert Rowsome <rowsome@wam.umd.edu>
-" Last Change:	2004 Mar 27
+" Last Change:	2019 Jul 23

 if exists("current_compiler")
  finish
@@ -15,7 +15,7 @@ if exists(":CompilerSet") != 2		" older Vim always used :setlocal
  command -nargs=* CompilerSet setlocal <args>
 endif

-CompilerSet makeprg=xmlwf\ %
+CompilerSet makeprg=xmlwf\ %:S

 CompilerSet errorformat=%f:%l%c:%m

--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -40,15 +40,18 @@ effects.  Be careful not to destroy your text.
 2. Defining autocommands				*autocmd-define*

 							*:au* *:autocmd*
-:au[tocmd] [group] {event} {pat} [nested] {cmd}
+:au[tocmd] [group] {event} {pat} [++once] [++nested] {cmd}
 			Add {cmd} to the list of commands that Vim will
 			execute automatically on {event} for a file matching
-			{pat} |autocmd-patterns|.
+			{pat} |autocmd-pattern|.
 			Note: A quote character is seen as argument to the
 			:autocmd and won't start a comment.
-			Vim always adds the {cmd} after existing autocommands,
-			so that the autocommands execute in the order in which
-			they were given.  See |autocmd-nested| for [nested].
+			Nvim always adds {cmd} after existing autocommands so
+			they execute in the order in which they were defined.
+			See |autocmd-nested| for [++nested].
+							*autocmd-once*
+			If [++once] is supplied the command is executed once,
+			then removed ("one shot").

 The special pattern <buffer> or <buffer=N> defines a buffer-local autocommand.
 See |autocmd-buflocal|.
@@ -116,10 +119,11 @@ prompt.  When one command outputs two messages this can happen anyway.
 ==============================================================================
 3. Removing autocommands				*autocmd-remove*

-:au[tocmd]! [group] {event} {pat} [nested] {cmd}
+:au[tocmd]! [group] {event} {pat} [++once] [++nested] {cmd}
 			Remove all autocommands associated with {event} and
-			{pat}, and add the command {cmd}.  See
-			|autocmd-nested| for [nested].
+			{pat}, and add the command {cmd}.
+			See |autocmd-once| for [++once].
+			See |autocmd-nested| for [++nested].

 :au[tocmd]! [group] {event} {pat}
 			Remove all autocommands associated with {event} and
@@ -264,8 +268,10 @@ Name			triggered by ~
 |BufNew|		just after creating a new buffer

 |SwapExists|		detected an existing swap file
-|TermOpen|		when a terminal job starts
-|TermClose|		when a terminal job ends
+|TermOpen|		starting a terminal job
+|TermEnter|		entering Terminal-mode
+|TermLeave|		leaving Terminal-mode
+|TermClose|		stopping a terminal job
 |ChanOpen|		after a channel opened
 |ChanInfo|		after a channel has its state changed

@@ -276,8 +282,8 @@ Name			triggered by ~

 	Startup and exit
 |VimEnter|		after doing all the startup stuff
-|GUIEnter|		after starting the GUI successfully
-|GUIFailed|		after starting the GUI failed
+|UIEnter|		after a UI attaches
+|UILeave|		after a UI detaches
 |TermResponse|		after the terminal response to t_RV is received
 |QuitPre|		when using `:quit`, before deciding whether to exit
 |ExitPre|		when using a command that may make Vim exit
@@ -301,6 +307,7 @@ Name			triggered by ~
 |FuncUndefined|		a user function is used but it isn't defined
 |SpellFileMissing|	a spell file is used but it can't be found
 |SourcePre|		before sourcing a Vim script
+|SourcePost|		after sourcing a Vim script
 |SourceCmd|		before sourcing a Vim script |Cmd-event|

 |VimResized|		after the Vim window size changed
@@ -350,9 +357,12 @@ Name			triggered by ~
 |SessionLoadPost|	after loading a session file

 |MenuPopup|		just before showing the popup menu
+|CompleteChanged|	after popup menu changed, not fired on popup menu hide
 |CompleteDone|		after Insert mode completion is done

 |User|			to be used in combination with ":doautocmd"
+|Signal|		after Nvim receives a signal
+


 The alphabetical list of autocommand events:		*autocmd-events-abc*
@@ -390,8 +400,8 @@ BufFilePost			After changing the name of the current buffer
 BufFilePre			Before changing the name of the current buffer
 				with the ":file" or ":saveas" command.
 							*BufHidden*
-BufHidden			Just after a buffer has become hidden.  That
-				is, when there are no longer windows that show
+BufHidden			Just before a buffer becomes hidden.  That is,
+				when there are no longer windows that show
 				the buffer, but the buffer is not unloaded or
 				deleted.  Not used for ":qa" or ":q" when
 				exiting Vim.
@@ -582,6 +592,23 @@ CompleteDone			After Insert mode completion is done.  Either
 				The |v:completed_item| variable contains the
 				completed item.

+CompleteChanged 					*CompleteChanged*
+				After each time the Insert mode completion
+				menu changed.  Not fired on popup menu hide,
+				use |CompleteDone| for that.  Never triggered
+				recursively.
+
+				Sets these |v:event| keys:
+				    completed_item	See |complete-items|.
+				    height		nr of items visible
+				    width		screen cells
+				    row			top screen row
+				    col			leftmost screen column
+				    size		total nr of items
+				    scrollbar		TRUE if visible
+
+				It is not allowed to change the text |textlock|.
+
 							*CursorHold*
 CursorHold			When the user doesn't press a key for the time
 				specified with 'updatetime'.  Not re-triggered
@@ -617,11 +644,13 @@ CursorHoldI			Just like CursorHold, but in Insert mode.

 							*CursorMoved*
 CursorMoved			After the cursor was moved in Normal or Visual
-				mode.  Also when the text of the cursor line
-				has been changed, e.g., with "x", "rx" or "p".
+				mode or to another window.  Also when the text
+				of the cursor line has been changed, e.g. with
+				"x", "rx" or "p".
 				Not triggered when there is typeahead or when
 				an operator is pending.
 				For an example see |match-parens|.
+				Note: Cannot be skipped with `:noautocmd`.
 				Careful: This is triggered very often, don't
 				do anything that the user does not expect or
 				that is slow.
@@ -751,13 +780,14 @@ FilterReadPre			Before reading a file from a filter command.
 				Not triggered when 'shelltemp' is off.
 							*FilterWritePost*
 FilterWritePost			After writing a file for a filter command or
-				making a diff.
+				making a diff with an external diff (see
+				DiffUpdated for internal diff).
 				Vim checks the pattern against the name of
 				the current buffer as with FilterWritePre.
 				Not triggered when 'shelltemp' is off.
 							*FilterWritePre*
 FilterWritePre			Before writing a file for a filter command or
-				making a diff.
+				making a diff with an external diff.
 				Vim checks the pattern against the name of
 				the current buffer, not the name of the
 				temporary file that is the output of the
@@ -777,19 +807,17 @@ FuncUndefined			When a user function is used but it isn't
 				NOTE: When writing Vim scripts a better
 				alternative is to use an autoloaded function.
 				See |autoload-functions|.
-							*GUIEnter*
-GUIEnter			After starting the GUI successfully, and after
-				opening the window.  It is triggered before
-				VimEnter when using gvim.  Can be used to
-				position the window from a gvimrc file: >
-	:autocmd GUIEnter * winpos 100 50
-<							*GUIFailed*
-GUIFailed			After starting the GUI failed.  Vim may
-				continue to run in the terminal, if possible
-				(only on Unix and alikes, when connecting the
-				X server fails).  You may want to quit Vim: >
-	:autocmd GUIFailed * qall
-<							*InsertChange*
+							*UIEnter*
+UIEnter				After a UI connects via |nvim_ui_attach()|,
+				after VimEnter.  Can be used for GUI-specific
+				configuration.
+				Sets these |v:event| keys:
+				    chan
+							*UILeave*
+UILeave				After a UI disconnects from Nvim.
+				Sets these |v:event| keys:
+				    chan
+							*InsertChange*
 InsertChange			When typing <Insert> while in Insert or
 				Replace mode.  The |v:insertmode| variable
 				indicates the new mode.
@@ -803,20 +831,25 @@ InsertCharPre			When a character is typed in Insert mode,
 				a different character.  When |v:char| is set
 				to more than one character this text is
 				inserted literally.
-				It is not allowed to change the text |textlock|.
-				The event is not triggered when 'paste' is
-				set.
+
+				Cannot change the text. |textlock|
+				Not triggered when 'paste' is set.
 							*TextYankPost*
 TextYankPost			Just after a |yank| or |deleting| command, but not
 				if the black hole register |quote_| is used nor
 				for |setreg()|. Pattern must be *.
 				Sets these |v:event| keys:
+				    inclusive
 				    operator
 				    regcontents
 				    regname
 				    regtype
+				The `inclusive` flag combined with the |'[|
+				and |']| marks can be used to calculate the
+				precise region of the operation.
+
 				Recursion is ignored.
-				It is not allowed to change the text |textlock|.
+				Cannot change the text. |textlock|
 							*InsertEnter*
 InsertEnter			Just before starting Insert mode.  Also for
 				Replace mode and Virtual Replace mode.  The
@@ -842,27 +875,48 @@ MenuPopup			Just before showing the popup menu (under the
 					i	Insert
 					c	Command line
 							*OptionSet*
-OptionSet			After setting an option.  The pattern is
-				matched against the long option name.
-				The |v:option_old| variable indicates the
-				old option value, |v:option_new| variable
-				indicates the newly set value, the
-				|v:option_type| variable indicates whether
-				it's global or local scoped and |<amatch>|
+OptionSet			After setting an option (except during
+				|startup|).  The |autocmd-pattern| is matched
+				against the long option name.  |<amatch>|
 				indicates what option has been set.

+				|v:option_type| indicates whether it's global
+				or local scoped.
+				|v:option_command| indicates what type of
+				set/let command was used (follow the tag to
+				see the table).
+				|v:option_new| indicates the newly set value.
+				|v:option_oldlocal| has the old local value.
+				|v:option_oldglobal| has the old global value.
+				|v:option_old| indicates the old option value.
+
+				|v:option_oldlocal| is only set when |:set|
+				or |:setlocal| or a |modeline| was used to set
+				the option. Similarly |v:option_oldglobal| is
+				only set when |:set| or |:setglobal| was used.
+
+				Note that when setting a |global-local| string
+				option with |:set|, then |v:option_old| is the
+				old global value. However, for all other kinds
+				of options (local string options, global-local
+				number options, ...) it is the old local
+				value.
+
+				OptionSet is not triggered on startup and for
+				the 'key' option for obvious reasons.
+
 				Usage example: Check for the existence of the
 				directory in the 'backupdir' and 'undodir'
 				options, create the directory if it doesn't
 				exist yet.

-				Note: It's a bad idea to reset an option
-				during this autocommand, this may break a
-				plugin. You can always use `:noa` to prevent
-				triggering this autocommand.
+				Note: Do not reset the same option during this
+				autocommand, that may break plugins. You can
+				always use |:noautocmd| to prevent triggering
+				OptionSet.

-				When using |:set| in the autocommand the event
-				is not triggered again.
+				Recursion is ignored, thus |:set| in the
+				autocommand does not trigger OptionSet again.

 							*QuickFixCmdPre*
 QuickFixCmdPre			Before a quickfix command is run (|:make|,
@@ -914,13 +968,24 @@ ShellCmdPost			After executing a shell command with |:!cmd|,
 				any changed files.
 				For non-blocking shell commands, see
 				|job-control|.
-							*ShellFilterPost*
+							*Signal*
+Signal				After Nvim receives a signal. The pattern is
+				matched against the signal name. Only
+				"SIGUSR1" is supported.  Example: >
+				    autocmd Signal SIGUSR1 call some#func()
+<							*ShellFilterPost*
 ShellFilterPost			After executing a shell command with
 				":{range}!cmd", ":w !cmd" or ":r !cmd".
 				Can be used to check for any changed files.
 							*SourcePre*
 SourcePre			Before sourcing a Vim script. |:source|
 				<afile> is the name of the file being sourced.
+							*SourcePost*
+SourcePost			After sourcing a Vim script. |:source|
+				<afile> is the name of the file being sourced.
+				Not triggered when sourcing was interrupted.
+				Also triggered after a SourceCmd autocommand
+				was triggered.
 							*SourceCmd*
 SourceCmd			When sourcing a Vim script. |:source|
 				<afile> is the name of the file being sourced.
@@ -962,7 +1027,6 @@ SwapExists			Detected an existing swap file when starting
 				It is not allowed to change to another buffer,
 				change a buffer name or change directory
 				here.
-				{only available with the +eval feature}
 							*Syntax*
 Syntax				When the 'syntax' option has been set.  The
 				pattern is matched against the syntax name.
@@ -987,11 +1051,17 @@ TabNewEntered			After entering a new tab page. |tab-page|
 							*TabClosed*
 TabClosed			After closing a tab page. <afile> can be used
 				for the tab page number.
-							*TermClose*
-TermClose			When a |terminal| job ends.
 							*TermOpen*
 TermOpen			When a |terminal| job is starting.  Can be
 				used to configure the terminal buffer.
+							*TermEnter*
+TermEnter			After entering |Terminal-mode|.
+				After TermOpen.
+							*TermLeave*
+TermLeave			After leaving |Terminal-mode|.
+				After TermClose.
+							*TermClose*
+TermClose			When a |terminal| job ends.
 							*TermResponse*
 TermResponse			After the response to t_RV is received from
 				the terminal.  The value of |v:termresponse|
@@ -1002,10 +1072,13 @@ TermResponse			After the response to t_RV is received from
 				anything else that takes time is involved).
 							*TextChanged*
 TextChanged			After a change was made to the text in the
-				current buffer in Normal mode.  That is when
-				|b:changedtick| has changed.
+				current buffer in Normal mode.  That is after
+				|b:changedtick| has changed (also when that
+				happened before the TextChanged autocommand
+				was defined).
 				Not triggered when there is typeahead or when
 				an operator is pending.
+				Note: Cannot be skipped with `:noautocmd`.
 				Careful: This is triggered very often, don't
 				do anything that the user does not expect or
 				that is slow.
@@ -1020,14 +1093,12 @@ TextChangedP			After a change was made to the text in the
 				popup menu is visible.  Otherwise the same as
 				TextChanged.
 							*User*
-User				Never executed automatically.  To be used for
-				autocommands that are only executed with
-				":doautocmd".
-				Note that when `:doautocmd User MyEvent` is
-				used while there are no matching autocommands,
-				you will get an error.  If you don't want
-				that, define a dummy autocommand yourself.
-							*UserGettingBored*
+User				Not executed automatically.  Use |:doautocmd|
+				to trigger this, typically for "custom events"
+				in a plugin.  Example: >
+				    :autocmd User MyPlugin echom 'got MyPlugin event'
+				    :doautocmd User MyPlugin
+<							*UserGettingBored*
 UserGettingBored		When the user presses the same key 42 times.
 				Just kidding! :-)
 							*VimEnter*
@@ -1092,7 +1163,7 @@ WinNew				When a new window was created.  Not done for
 				Before a WinEnter event.

 ==============================================================================
-6. Patterns					*autocmd-patterns* *{pat}*
+6. Patterns					*autocmd-pattern* *{pat}*

 The {pat} argument can be a comma separated list.  This works as if the
 command was given with each pattern separately.  Thus this command: >
@@ -1305,7 +1376,7 @@ have changed autocommands, or when Vim has executed the wrong autocommands
 Note that the 'eventignore' option applies here too.  Events listed in this
 option will not cause any commands to be executed.

-					*:do* *:doau* *:doautocmd* *E217*
+				*:do* *:doau* *:doaut* *:doautocmd* *E217*
 :do[autocmd] [<nomodeline>] [group] {event} [fname]
 			Apply the autocommands matching [fname] (default:
 			current file name) for {event} to the current buffer.
@@ -1317,24 +1388,22 @@ option will not cause any commands to be executed.
 			another extension.  Example: >
 				:au BufEnter *.cpp so ~/.config/nvim/init_cpp.vim
 				:au BufEnter *.cpp doau BufEnter x.c
-<			Be careful to avoid endless loops.  See
-			|autocmd-nested|.
+<			Be careful to avoid endless loops.  |autocmd-nested|

 			When the [group] argument is not given, Vim executes
 			the autocommands for all groups.  When the [group]
 			argument is included, Vim executes only the matching
-			autocommands for that group.  Note: if you use an
-			undefined group name, Vim gives you an error message.
+			autocommands for that group.  Undefined group is an
+			error.
 							*<nomodeline>*
 			After applying the autocommands the modelines are
 			processed, so that their settings overrule the
-			settings from autocommands, like what happens when
-			editing a file. This is skipped when the <nomodeline>
-			argument is present. You probably want to use
-			<nomodeline> for events that are not used when loading
-			a buffer, such as |User|.
-			Processing modelines is also skipped when no
-			matching autocommands were executed.
+			settings from autocommands when editing a file. This
+			is skipped if <nomodeline> is specified. You probably
+			want to use <nomodeline> for events not used when
+			loading a buffer, such as |User|.
+			Modelines are also skipped when no matching
+			autocommands were executed.

 						*:doautoa* *:doautoall*
 :doautoa[ll] [<nomodeline>] [group] {event} [fname]
@@ -1431,11 +1500,11 @@ If you want the buffer to be unmodified after changing it, reset the
 instead of ":q!".

 							*autocmd-nested* *E218*
-By default, autocommands do not nest.  If you use ":e" or ":w" in an
-autocommand, Vim does not execute the BufRead and BufWrite autocommands for
-those commands.  If you do want this, use the "nested" flag for those commands
-in which you want nesting.  For example: >
-  :autocmd FileChangedShell *.c nested e!
+By default, autocommands do not nest.  For example, if you use ":e" or ":w" in
+an autocommand, Vim does not execute the BufRead and BufWrite autocommands for
+those commands.  If you do want this, use the "++nested" flag for those
+commands in which you want nesting.  For example: >
+  :autocmd FileChangedShell *.c ++nested e!
 The nesting is limited to 10 levels to get out of recursive loops.

 It's possible to use the ":au" command in an autocommand.  This can be a
@@ -1578,5 +1647,8 @@ following command.  Example: >
 This will write the file without triggering the autocommands defined by the
 gzip plugin.

+Note that some autocommands are not triggered right away, but only later.
+This specifically applies to |CursorMoved| and |TextChanged|.
+

 vim:tw=78:ts=8:noet:ft=help:norl:
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -162,8 +162,6 @@ gR			Enter Virtual Replace mode: Each character you type
 			<Tab> may replace several characters at once.
 			Repeat the entered text [count]-1 times.  See
 			|Virtual-Replace-mode| for more details.
-			{not available when compiled without the |+vreplace|
-			feature}

 							*c*
 ["x]c{motion}		Delete {motion} text [into register x] and start
@@ -282,14 +280,11 @@ gr{char}		Replace the virtual characters under the cursor with
 			space.  See |gR| and |Virtual-Replace-mode| for more
 			details.  As with |r| a count may be given.
 			{char} can be entered like with |r|.
-			{not available when compiled without the |+vreplace|
-			feature}

 						*digraph-arg*
 The argument for Normal mode commands like |r| and |t| is a single character.
 When 'cpo' doesn't contain the 'D' flag, this character can also be entered
 like |digraphs|.  First type CTRL-K and then the two digraph characters.
-{not available when compiled without the |+digraphs| feature}

 						*case*
 The following commands change the case of letters.  The currently active
@@ -600,11 +595,11 @@ Directory for temporary files is created in the first suitable directory of:
 			For the {pattern} see |pattern|.
 			{string} can be a literal string, or something
 			special; see |sub-replace-special|.
-							*E939*
 			When [range] and [count] are omitted, replace in the
 			current line only.  When [count] is given, replace in
 			[count] lines, starting with the last line in [range].
 			When [range] is omitted start in the current line.
+							*E939*
 			[count] must be a positive number.  Also see
 			|cmdline-ranges|.

@@ -800,7 +795,7 @@ the |substitute()| function with the following exceptions:
  - magic is always set without regard to 'magic'.
  - A ~ inserts a tilde literally.
  - <CR> and \r inserts a carriage-return (CTRL-M).
-  - \<CR> does not have a special meaning. it's just one of \x.
+  - \<CR> does not have a special meaning. It's just one of \x.

 Examples: >
  :s/a\|b/xxx\0xxx/g		 modifies "a b"	     to "xxxaxxx xxxbxxx"
@@ -886,9 +881,9 @@ When the result is a |List| then the items are joined with separating line
 breaks.  Thus each item becomes a line, except that they can contain line
 breaks themselves.

-The whole matched text can be accessed with "submatch(0)".  The text matched
-with the first pair of () with "submatch(1)".  Likewise for further
-sub-matches in ().
+The |submatch()| function can be used to obtain matched text.  The whole
+matched text can be accessed with "submatch(0)".  The text matched with the
+first pair of () with "submatch(1)".  Likewise for further sub-matches in ().

 Be careful: The separation character must not appear in the expression!
 Consider using a character like "@" or ":".  There is no problem if the result
@@ -939,8 +934,6 @@ This replaces each 'E' character with a euro sign.  Read more in |<Char->|.
 			this (that's a good habit anyway).
 			`:retab!` may also change a sequence of spaces by
 			<Tab> characters, which can mess up a printf().
-			Not available when |+ex_extra| feature was disabled at
-			compile time.

 							*retab-example*
 Example for using autocommands and ":retab" to edit a file which is stored
@@ -1139,9 +1132,9 @@ There are ten types of registers:			*registers* *E354*
 2. 10 numbered registers "0 to "9
 3. The small delete register "-
 4. 26 named registers "a to "z or "A to "Z
-5. three read-only registers ":, "., "%
-6. alternate buffer register "#
-7. the expression register "=
+5. Three read-only registers ":, "., "%
+6. Alternate buffer register "#
+7. The expression register "=
 8. The selection registers "* and "+
 9. The black hole register "_
 10. Last search pattern register "/
@@ -1291,21 +1284,15 @@ The next three commands always work on whole lines.
 :[range]ce[nter] [width]				*:ce* *:center*
 			Center lines in [range] between [width] columns
 			(default 'textwidth' or 80 when 'textwidth' is 0).
-			Not available when |+ex_extra| feature was disabled at
-			compile time.

 :[range]ri[ght] [width]					*:ri* *:right*
 			Right-align lines in [range] at [width] columns
 			(default 'textwidth' or 80 when 'textwidth' is 0).
-			Not available when |+ex_extra| feature was disabled at
-			compile time.

 							*:le* *:left*
 :[range]le[ft] [indent]
 			Left-align lines in [range].  Sets the indent in the
 			lines to [indent] (default 0).
-			Not available when |+ex_extra| feature was disabled at
-			compile time.

 							*gq*
 gq{motion}		Format the lines that {motion} moves over.
@@ -1635,6 +1622,17 @@ j	Where it makes sense, remove a comment leader when joining lines.  For
 		         // in the list ~
 	Becomes:
 		int i;   // the index in the list ~
+p	Don't break lines at single spaces that follow periods.  This is
+	intended to complement 'joinspaces' and |cpo-J|, for prose with
+	sentences separated by two spaces.  For example, with 'textwidth' set
+	to 28: >
+		Surely you're joking, Mr. Feynman!
+<	Becomes: >
+		Surely you're joking,
+		Mr. Feynman!
+<	Instead of: >
+		Surely you're joking, Mr.
+		Feynman!


 With 't' and 'c' you can specify when Vim performs auto-wrapping:
--- a/runtime/doc/channel.txt
+++ b/runtime/doc/channel.txt
@@ -30,7 +30,7 @@ There are several ways to open a channel:

 Channels support multiple modes or protocols. In the most basic
 mode of operation, raw bytes are read and written to the channel.
-The |rpc| protocol, based on the msgpack-rpc standard, enables nvim and the
+The |RPC| protocol, based on the msgpack-rpc standard, enables nvim and the
 process at the other end to send remote calls and events to each other.
 The builtin |terminal-emulator| is also implemented on top of PTY channels.

@@ -43,63 +43,66 @@ functions like |chansend()| consume channel ids.
 ==============================================================================
 2. Reading and writing raw bytes			      *channel-bytes*

-By default, channels opened by vimscript functions will operate with raw
-bytes. Additionally, for a job channel using rpc, bytes can still be
-read over its stderr. Similarily, only bytes can be written to nvim's own stderr.
+Channels opened by Vimscript functions operate with raw bytes by default. For
+a job channel using RPC, bytes can still be read over its stderr. Similarily,
+only bytes can be written to Nvim's own stderr.

-						    *channel-callback* *buffered*
-				*E5210* *on_stdout* *on_stderr* *on_stdin* *on_data*
-It is possible to register callback functions when a channel receives data by
-passing the `on_stdout`, `on_stderr`, `on_stdin` options on creation. Sockets
-may specify an `on_data` callback instead. Each callback function will be
-invoked with data read from the channel. By default, the callback will be
-invoked immediately when data is available, to facilitate interactive
-communication. The same callback will then be invoked with empty data, to
-indicate that the stream reached EOF. Alternatively the `stdout_buffered`,
-`stderr_buffered`, `stdin_buffered`, `data_buffered` options can be set to
-invoke the corresponding callback only when the underlying stream reaches EOF.
-The callback will then be passed complete output. This is helpful when only
-the complete output is useful, and not partial data. Futhermore if the stream
-is set to be buffered, but the callback is not set, the data is saved in the
-options dict, with the stream name as key. For this to work a new options dict
-must be used for each opened channel. If a script uses a global `s:job_opts`
-dict, it can be copied with |copy()| before supplying it to |jobstart()|. If a
-dict is reused, so that the dict key already is occupied, error `E5210` will
-be raised.
+						*channel-callback*
+on_stdout({chan-id}, {data}, {name})		*on_stdout* 
+on_stderr({chan-id}, {data}, {name})		*on_stderr* 
+on_stdin({chan-id}, {data}, {name})		*on_stdin* 
+on_data({chan-id}, {data}, {name})		*on_data*
+    Scripts can react to channel activity (received data) via callback
+    functions assigned to the `on_stdout`, `on_stderr`, `on_stdin`, or
+    `on_data` option keys. Callbacks should be fast: avoid potentially
+    slow/expensive work.

- The arguments passed to the callback function are:
+    Parameters: ~
+      {chan-id}     Channel handle. |channel-id|
+      {data}	    Raw data (|readfile()|-style list of strings) read from
+		    the channel. EOF is a single-item list: `['']`. First and
+		    last items may be partial lines! |channel-lines|
+      {name}	    Stream name (string) like "stdout", so the same function
+		    can handle multiple streams. Event names depend on how the
+		    channel was opened and in what mode/protocol.

-  0: |channel-id|
-  1: Raw data read from the channel, formatted as a |readfile()|-style
-     list. If EOF occured, a single empty string `['']` will be passed in.
-     Note that the items in this list do not directly correspond to actual
-     lines in the output. See |channel-lines|
-  2: Stream name as a string, like `"stdout"`. This is to allow multiple
-  stream handlers to be implemented by the same function. The available
-  events depend on how the channel was opened and in what mode/protocol.
+						*channel-buffered*
+    The callback is invoked immediately as data is available, where
+    a single-item list `['']` indicates EOF (stream closed).  Alternatively
+    set the `stdout_buffered`, `stderr_buffered`, `stdin_buffered`, or
+    `data_buffered` option keys to invoke the callback only after all output
+    was gathered and the stream was closed.
+						*E5210*
+    If a buffering mode is used without a callback, the data is saved in the
+    stream {name} key of the options dict. It is an error if the key exists.

 							      *channel-lines*
-  Note:
-	stream event handlers may receive partial (incomplete) lines. For a given
-	invocation of on_stdout etc, `a:data` is not guaranteed to end
-	with a newline.
-	  - `abcdefg` may arrive as `['abc']`, `['defg']`.
-	  - `abc\nefg` may arrive as `['abc', '']`, `['efg']` or `['abc']`,
-	    `['','efg']`, or even `['ab']`, `['c','efg']`.
-	
-	If you only are interested in complete output when the process exits,
-	use buffered mode. Otherwise, an easy way to deal with this:
-	initialize a list as `['']`, then append to it as follows: >
-	  let s:chunks = ['']
+    Stream event handlers receive data as it becomes available from the OS,
+    thus the first and last items in the {data} list may be partial lines.
+    Empty string completes the previous partial line. Examples (not including
+    the final `['']` emitted at EOF):
+      - `foobar` may arrive as `['fo'], ['obar']` 
+      - `foo\nbar` may arrive as
+	   `['foo','bar']`
+	or `['foo',''], ['bar']`
+	or `['foo'], ['','bar']`
+	or `['fo'], ['o','bar']`
+    There are two ways to deal with this:
+    1. To wait for the entire output, use |channel-buffered| mode.
+    2. To read line-by-line, use the following code: >
+	let s:lines = ['']
 	func! s:on_event(job_id, data, event) dict
-	    let s:chunks[-1] .= a:data[0]
-	    call extend(s:chunks, a:data[1:])
+	  let eof = (a:data == [''])
+	  " Complete the previous line.
+	  let s:lines[-1] .= a:data[0]
+	  " Append (last item may be a partial line, until EOF).
+	  call extend(s:lines, a:data[1:])
 	endf
 <

-Additionally, if the callbacks are Dictionary functions, |self| can be used to
-refer to the options dictionary containing the callbacks. |Partial|s can also be
-used as callbacks.
+If the callback functions are |Dictionary-function|s, |self| refers to the
+options dictionary containing the callbacks. |Partial|s can also be used as
+callbacks.

 Data can be sent to the channel using the |chansend()| function. Here is a
 simple example, echoing some data through a cat-process:
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -250,20 +250,13 @@ CTRL-A		command-line completion (see |cmdline-completion|)
 CTRL-L		command-line completion (see |cmdline-completion|)

 							*c_CTRL-_*
-CTRL-_		a - switch between Hebrew and English keyboard mode, which is
+CTRL-_		Switch between Hebrew and English keyboard mode, which is
 		private to the command-line and not related to hkmap.
 		This is useful when Hebrew text entry is required in the
 		command-line, searches, abbreviations, etc.  Applies only if
 		the 'allowrevins' option is set.
 		See |rileft.txt|.

-		b - switch between Farsi and English keyboard mode, which is
-		private to the command-line and not related to fkmap.  In
-		Farsi keyboard mode the characters are inserted in reverse
-		insert manner.  This is useful when Farsi text entry is
-		required in the command-line, searches, abbreviations, etc.
-		See |farsi.txt|.
-
 							*c_CTRL-^*
 CTRL-^		Toggle the use of language |:lmap| mappings and/or Input
 		Method.
@@ -423,6 +416,10 @@ a previous version <Esc> was used).  In the pattern standard wildcards '*' and
 '?' are accepted when matching file names.  '*' matches any string, '?'
 matches exactly one character.

+When repeating 'wildchar' or CTRL-N you cycle through the matches, eventually
+ending up back to what was typed.  If the first match is not what you wanted,
+you can use <S-Tab> or CTRL-P to go straight back to what you typed.
+
 The 'wildignorecase' option can be set to ignore case in filenames.

 The 'wildmenu' option can be set to show the matches just above the command
@@ -502,7 +499,6 @@ that see the '"' as part of their argument:
    :autocmd
    :bufdo
    :cexpr (and the like)
-    :call
    :cdo (and the like)
    :command
    :cscope (and the like)
@@ -664,7 +660,7 @@ commands ":write" and ":global" have the whole file (1,$) as default.
 If more line specifiers are given than required for the command, the first
 one(s) will be ignored.

-Line numbers may be specified with:		*:range* *E14* *{address}*
+Line numbers may be specified with:		*:range* *{address}*
 	{number}	an absolute line number
 	.		the current line			  *:.*
 	$		the last line in the file		  *:$*
@@ -796,7 +792,6 @@ function |expand()|.
 	#<n	(where n is a number > 0) is replaced with old	  *:_#<* *c_#<*
 		file name n.  See |:oldfiles| or |v:oldfiles| to get the
 		number.							*E809*
-		{only when compiled with the |+eval| and |+shada| features}

 Note that these, except "#<n", give the file name as it was typed.  If an
 absolute path is needed (when using the file name from a different directory),
@@ -821,11 +816,12 @@ it, no matter how many backslashes.
 	   \\#			\#
 Also see |`=|.

-			       *:<cword>* *:<cWORD>* *:<cfile>* *<cfile>*
-			       *:<sfile>* *<sfile>* *:<afile>* *<afile>*
-			       *:<abuf>* *<abuf>* *:<amatch>* *<amatch>*
-			       *:<cexpr>* *<cexpr>*
-			       *<slnum>* *E495* *E496* *E497* *E499* *E500*
+			       *:<cword>* *<cword>* *:<cWORD>* *<cWORD>*
+			       *:<cexpr>* *<cexpr>* *:<cfile>* *<cfile>*
+			       *:<afile>* *<afile>* *:<abuf>* *<abuf>*
+			       *:<amatch>* *<amatch>*
+			       *:<sfile>* *<sfile>* *:<slnum>* *<slnum>*
+			       *:<sflnum>* *<sflnum>* *E499* *E500*
 Note: these are typed literally, they are not special keys!
 	<cword>    is replaced with the word under the cursor (like |star|)
 	<cWORD>    is replaced with the WORD under the cursor (see |WORD|)
@@ -838,15 +834,16 @@ Note: these are typed literally, they are not special keys!
 		   |gf| uses)
 	<afile>    When executing autocommands, is replaced with the file name
 		   of the buffer being manipulated, or the file for a read or
-		   write.
+		   write.  *E495*
 	<abuf>     When executing autocommands, is replaced with the currently
 		   effective buffer number (for ":r file" and ":so file" it is
 		   the current buffer, the file being read/sourced is not in a
-		   buffer).
+		   buffer).  *E496*
 	<amatch>   When executing autocommands, is replaced with the match for
-		   which this autocommand was executed.  It differs from
-		   <afile> only when the file name isn't used to match with
-		   (for FileType, Syntax and SpellFileMissing events).
+		   which this autocommand was executed.  *E497*
+		   It differs from <afile> only when the file name isn't used
+		   to match with (for FileType, Syntax and SpellFileMissing
+		   events).
 	<sfile>    When executing a ":source" command, is replaced with the
 		   file name of the sourced file.  *E498*
 		   When executing a function, is replaced with:
@@ -859,14 +856,15 @@ Note: these are typed literally, they are not special keys!
 		   line number.  *E842*
 		   When executing a function it's the line number relative to
 		   the start of the function.
+	<sflnum>   When executing a script, is replaced with the line number.
+		   It differs from <slnum> in that <sflnum> is replaced with
+		   the script line number in any situation.  *E961*

 							 *filename-modifiers*
 *:_%:* *::8* *::p* *::.* *::~* *::h* *::t* *::r* *::e* *::s* *::gs* *::S*
     *%:8* *%:p* *%:.* *%:~* *%:h* *%:t* *%:r* *%:e* *%:s* *%:gs* *%:S*
 The file name modifiers can be used after "%", "#", "#n", "<cfile>", "<sfile>",
 "<afile>" or "<abuf>".  They are also used with the |fnamemodify()| function.
-These are not available when Vim has been compiled without the |+modify_fname|
-feature.
 These modifiers can be given, in this order:
 	:p	Make file name a full path.  Must be the first modifier.  Also
 		changes "~/" (and "~user/" for Unix) to the path for the home
@@ -1109,8 +1107,8 @@ in the command-line window, like this: >
 Note that hitting <Tab> in Normal mode will do completion on the next
 character.  That way it works at the end of the line.
 If you don't want these mappings, disable them with: >
-	au CmdwinEnter [:>] iunmap <Tab>
-	au CmdwinEnter [:>] nunmap <Tab>
+	au CmdwinEnter [:>] iunmap <buffer> <Tab>
+	au CmdwinEnter [:>] nunmap <buffer> <Tab>
 You could put these lines in your vimrc file.

 While in the command-line window you cannot use the mouse to put the cursor in
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -76,15 +76,10 @@ matches the EXE (same date).
 If you built the executable yourself with the Microsoft Visual C++ compiler,
 then the PDB was built with the EXE.

-Alternatively, if you have the source files, you can import Make_ivc.mak into
-Visual Studio as a workspace.  Then select a debug configuration, build and
-you can do all kinds of debugging (set breakpoints, watch variables, etc.).
-
 If you have Visual Studio, use that instead of the VC Toolkit and WinDbg.

-For other compilers, you should always use the corresponding debugger: TD for
-a Vim executable compiled with the Borland compiler; gdb (see above
-|debug-gcc|) for the Cygwin and MinGW compilers.
+For other compilers, you should always use the corresponding debugger: gdb
+(see above |debug-gcc|) for the Cygwin and MinGW compilers.


 								*debug-vs2005*
@@ -112,7 +107,7 @@ line numbers.  Double-click one of the lines and the Find Source dialog will
 appear.  Navigate to the directory where the Vim source is (if you have it.)

 If you don't know how to debug this any further, follow the instructions
-at ":help bug-reports".  Paste the call stack into the bug report.
+at ":help bug-report".  Paste the call stack into the bug report.

 If you have a non-free version of Visual Studio, you can save a minidump via
 the Debug menu and send it with the bug report.  A minidump is a small file
--- a/runtime/doc/deprecated.txt
+++ b/runtime/doc/deprecated.txt
@@ -12,6 +12,9 @@ updated.

 ==============================================================================

+API ~
+*nvim_buf_clear_highlight()*	Use |nvim_buf_clear_namespace()| instead.
+
 Commands ~
 *:rv*
 *:rviminfo*		Deprecated alias to |:rshada| command.
@@ -25,6 +28,8 @@ Environment Variables ~
 Events ~
 *EncodingChanged*	Never fired; 'encoding' is always "utf-8".
 *FileEncoding*		Never fired; equivalent to |EncodingChanged|.
+*GUIEnter*		Never fired; use |UIEnter| instead.
+*GUIFailed*		Never fired.

 Keycodes ~
 *<MouseDown>*		Use <ScrollWheelUp> instead.
@@ -41,6 +46,11 @@ Functions ~
 *jobclose()*		Obsolete name for |chanclose()|
 *jobsend()*		Obsolete name for |chansend()|
 *last_buffer_nr()*	Obsolete name for bufnr("$").
+*rpcstop()*		Deprecated. Instead use |jobstop()| to stop any job,
+			or chanclose(id, "rpc") to close RPC communication
+			without stopping the job. Use chanclose(id) to close
+			any socket.
+

 Modifiers ~
 *cpo-<*
@@ -55,6 +65,10 @@ Normal commands ~

 Options ~
 *'cscopeverbose'*	Enabled by default. Use |:silent| instead.
+*'exrc'* *'ex'*		Security risk: downloaded files could include
+			a malicious .nvimrc or .exrc file. See 'secure'.
+			Recommended alternative: define an autocommand in your
+			|vimrc| to set options for a matching directory.
 'gd'
 'gdefault'		Enables the |:substitute| flag 'g' by default.
 *'fe'*			'fenc'+'enc' before Vim 6.0; no longer used.
@@ -62,6 +76,14 @@ Options ~
 *'langnoremap'*		Deprecated alias to 'nolangremap'.
 *'vi'*
 *'viminfo'*		Deprecated alias to 'shada' option.
+*'viminfofile'*		Deprecated alias to 'shadafile' option.
+
+UI extensions~
+*ui-wildmenu*		Use |ui-cmdline| with |ui-popupmenu| instead. Enabled
+			by the `ext_wildmenu` |ui-option|. Emits these events:
+				["wildmenu_show", items]
+				["wildmenu_select", selected]
+				["wildmenu_hide"]

 Variables~
 *b:terminal_job_pid*	PID of the top-level process in a |:terminal|.
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -4,7 +4,7 @@
                            NVIM REFERENCE MANUAL


-Development of Nvim					*development*
+Development of Nvim					*development* *dev*

 This reference describes design constraints and guidelines, for developing
 Nvim applications or Nvim itself.
@@ -79,17 +79,16 @@ include the kitchen sink... but it's good for plumbing."


 ==============================================================================
-Developer guidelines				        *dev*
+Developer guidelines				        *dev-guidelines*


 PROVIDERS 						*dev-provider*

-A goal of Nvim is to allow extension of the editor without special knowledge
-in the core. But some Vim components are too tightly coupled; in those cases
-a "provider" hook is exposed.
+A primary goal of Nvim is to allow extension of the editor without special
+knowledge in the core.  Some core functions are delegated to "providers"
+implemented as external scripts.

-Consider two examples of integration with external systems that are
-implemented in Vim and are now decoupled from Nvim core as providers:
+Examples:

 1. In the Vim source code, clipboard logic accounts for more than 1k lines of
   C source code (ui.c), to perform two tasks that are now accomplished with
@@ -101,29 +100,28 @@ implemented in Vim and are now decoupled from Nvim core as providers:
   scripting is performed by an external host process implemented in ~2k lines
   of Python.

-Ideally we could implement Python and clipboard integration in pure vimscript
-and without touching the C code. But this is infeasible without compromising
-backwards compatibility with Vim; that's where providers help.
+The provider framework invokes VimL from C.  It is composed of two functions
+in eval.c:

-The provider framework helps call vimscript from C. It is composed of two
-functions in eval.c:
-
- eval_call_provider(name, method, arguments): calls provider#(name)#Call
+- eval_call_provider(name, method, arguments): calls provider#{name}#Call
  with the method and arguments.
- eval_has_provider(name): Checks if a provider is implemented. Returns true
-  if the provider#(name)#Call function is implemented. Called by |has()|
-  (vimscript) to check if features are available.
-
-The provider#(name)#Call function implements integration with an external
-system, because shell commands and |RPC| clients are easier to work with in
-vimscript.
+- eval_has_provider(name): Checks the `g:loaded_{name}_provider` variable
+  which must be set to 2 by the provider script to indicate that it is
+  "enabled and working". Called by |has()| to check if features are available.

 For example, the Python provider is implemented by the
-autoload/provider/python.vim script; the provider#python#Call function is only
-defined if a valid external Python host is found. That works well with the
-`has('python')` expression (normally used by Python plugins) because if the
-Python host isn't installed then the plugin will "think" it is running in
-a Vim compiled without the |+python| feature.
+"autoload/provider/python.vim" script, which sets `g:loaded_python_provider`
+to 2 only if a valid external Python host is found.  Then `has("python")`
+reflects whether Python support is working.
+
+							*provider-reload*
+Sometimes a GUI or other application may want to force a provider to
+"reload".  To reload a provider, undefine its "loaded" flag, then use
+|:runtime| to reload it: >
+
+    :unlet g:loaded_clipboard_provider
+    :runtime autoload/provider/clipboard.vim
+

 DOCUMENTATION						*dev-doc*

@@ -157,37 +155,55 @@ with a {thing} that groups functions under a common concept).

 Use existing common {action} names if possible:
    add   Append to, or insert into, a collection
-    get   Get a thing (or subset of things by some query)
-    set   Set a thing
+    get   Get a thing (or group of things by query)
+    set   Set a thing (or group of things)
    del   Delete a thing (or group of things)
    list  Get all things

 Use consistent names for {thing} in all API functions. E.g. a buffer is called
 "buf" everywhere, not "buffer" in some places and "buf" in others.

-Example: `nvim_get_current_line` acts on the global editor state; the common
+Example:
+    `nvim_get_current_line` acts on the global editor state; the common
    {action} "get" is used but {thing} is omitted.

-Example: `nvim_buf_add_highlight` acts on a `Buffer` object (the first
-parameter) and uses the common {action} "add".
+Example:
+    `nvim_buf_add_highlight` acts on a `Buffer` object (the first parameter)
+    and uses the common {action} "add".

-Example: `nvim_list_bufs` operates in a global context (first parameter is
-_not_ a Buffer). The common {action} "list" indicates that it lists all
-bufs (plural) in the global context.
+Example:
+    `nvim_list_bufs` operates in a global context (first parameter is not
+    a Buffer). The common {action} "list" indicates that it lists all bufs
+    (plural) in the global context.

 Use this template to name new API events:
    nvim_{thing}_{event}_event

-Example: `nvim_buf_changedtick_event`.
+Example:
+    `nvim_buf_changedtick_event`


 API-CLIENT						*dev-api-client*

+							*api-client*
+API clients wrap the Nvim |API| to provide idiomatic "SDKs" for their
+respective platforms (see |jargon|). You can build a new API client for your
+favorite platform or programming language.
+
+List of API clients:
+    https://github.com/neovim/neovim/wiki/Related-projects#api-clients
+
+							*pynvim*
+The Python client is the reference implementation for API clients.
+    https://github.com/neovim/pynvim
+
 Standard Features ~

+- API clients exist to hide msgpack-rpc details. The wrappers can be
+  automatically generated by reading the |api-metadata| from Nvim. |api-mapping|
 - Clients should call |nvim_set_client_info()| after connecting, so users and
-  plugins can detect the client by handling the |ChanInfo| event. This
-  avoids the need for special variables or other client hints.
+  plugins can detect the client by handling the |ChanInfo| event. This avoids
+  the need for special variables or other client hints.
 - Clients should handle |nvim_error_event| notifications, which will be sent
  if an async request to nvim was rejected or caused an error.

@@ -207,12 +223,28 @@ Examples of API-client package names:
        BAD:  python-client
        BAD:  neovim

-Implementation ~
+API client implementation guidelines ~

-Consider using libmpack instead of the msgpack.org C/C++ library. libmpack is
-small (can be inlined into your C/C++ project) and efficient (no allocations).
-It also implements msgpack-RPC.
+- Separate the transport layer from the rest of the library. |rpc-connecting|
+- Use a MessagePack library that implements at least version 5 of the
+  MessagePack spec, which supports the BIN and EXT types used by Nvim.
+- Use a single-threaded event loop library/pattern.
+- Use a fiber/coroutine library for the language being used for implementing
+  a client. These greatly simplify concurrency and allow the library to
+  expose a blocking API on top of a non-blocking event loop without the
+  complexity that comes with preemptive multitasking.
+- Don't assume anything about the order of responses to RPC requests.
+- Clients should expect requests, which must be handled immediately because
+  Nvim is blocked while waiting for the client response.
+- Clients should expect notifications, but these can be handled "ASAP" (rather
+  than immediately) because they won't block Nvim.
+- For C/C++ projects, consider libmpack instead of the msgpack.org library.
    https://github.com/libmpack/libmpack/
+  libmpack is small (no dependencies, can inline into your C/C++ project) and
+  efficient (no allocations). It also implements msgpack-RPC, the protocol
+  required by Nvim.
+    https://github.com/msgpack-rpc/msgpack-rpc
+

 EXTERNAL UI 						*dev-ui*

--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -175,7 +175,7 @@ hidden buffers.  You can use ":hide" to close a window without unloading the
 buffer.  If you don't want a buffer to remain used for the diff do ":set
 nodiff" before hiding it.

-							*:dif* *:diffupdate*
+						*:dif* *:diff* *:diffupdate*
 :dif[fupdate][!]		Update the diff highlighting and folds.

 Vim attempts to keep the differences updated when you make changes to the
@@ -325,7 +325,7 @@ After setting this variable, reload the syntax script: >
 FINDING THE DIFFERENCES					*diff-diffexpr*

 The 'diffexpr' option can be set to use something else than the standard
-"diff" program to compare two files and find the differences.
+"diff" program to compare two files and find the differences. *E959*

 When 'diffexpr' is empty, Vim uses this command to find the differences
 between file1 and file2: >
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -32,9 +32,6 @@ An alternative is using the 'keymap' option.
 			first character, it has a special meaning in the
 			future.

-Vim is normally compiled with the |+digraphs| feature.  If the feature is
-disabled, the ":digraph" command will display an error message.
-
 Example of the output of ":digraphs": >
 TH Þ  222  ss ß  223  a! à  224  a' á  225  a> â  226  a? ã  227  a: ä  228

@@ -53,18 +50,9 @@ conversion to be available, it might fail.  For the NUL character you will see
 "10".  That's because NUL characters are internally represented with a NL
 character.  When you write the file it will become a NUL character.

-When Vim was compiled without the |+multi_byte| feature, you need to specify
-the character in the encoding given with 'encoding'.  You might want to use
-something like this: >
-
-	if has("multi_byte")
+Example: >
 	digraph oe 339
-	elseif &encoding == "iso-8859-15"
-		digraph oe 189
-	endif
-
-This defines the "oe" digraph for a character that is number 339 in Unicode
-and 189 in latin9 (iso-8859-15).
+This defines the "oe" digraph for a character that is number 339 in Unicode.

 ==============================================================================
 2. Using digraphs					*digraphs-use*
@@ -107,11 +95,14 @@ this, you will have to type <BS> e again.  To avoid this don't set the

 You may have problems using Vim with characters which have a value above 128.
 For example: You insert ue (u-umlaut) and the editor echoes \334 in Insert
-mode.  After leaving the Insert mode everything is fine.  Note that fmt
-removes all characters with a value above 128 from the text being formatted.
-On some Unix systems this means you have to define the environment-variable
-LC_CTYPE.  If you are using csh, then put the following line in your .cshrc: >
-	setenv LC_CTYPE iso_8859_1
+mode.  After leaving the Insert mode everything is fine.  On some Unix systems
+this means you have to define the environment-variable LC_CTYPE.  If you are
+using csh, then put the following line in your .cshrc: >
+	setenv LC_CTYPE en_US.utf8
+(or similar for a different language or country). The value must be a valid
+locale on your system, i.e. on Unix-like systems it must be present in the
+output of >
+	locale -a

 ==============================================================================
 3. Default digraphs					*digraphs-default*
@@ -155,8 +146,7 @@ a standard meaning:
 Example: a: is ä  and o: is ö

 These are the RFC1345 digraphs for the one-byte characters.  See the output of
-":digraphs" for the others.  The characters above 255 are only available when
-Vim was compiled with the |+multi_byte| feature.
+":digraphs" for the others.

 EURO

--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`custom: https://salt.bountysource.com/teams/neovim`